Lukas Matena 227cc4dc33 Fixed conflicts after merge ...

slaposHollowing was divided into slaposHollowing and slaposDrillHoles on master
This commit takes this into account on the code that was merged from lm_drilling_backend_rebased

2020-02-03 15:42:54 +01:00

..

GLGizmoBase.cpp

Fixed conflicts after merge

2020-02-03 15:42:54 +01:00

GLGizmoBase.hpp

Clipping plane is now common for Hollowing and SLA supports gizmos

2020-02-03 15:17:18 +01:00

GLGizmoCut.cpp

Cut Gizmo -> added movements using arrow keys:

2020-02-03 15:00:49 +01:00

GLGizmoCut.hpp

Cut Gizmo -> added movements using arrow keys:

2020-02-03 15:00:49 +01:00

GLGizmoFlatten.cpp

…

GLGizmoFlatten.hpp

…

GLGizmoHollow.cpp

Hollowing gizmo - controls layout improvements

2020-02-03 15:17:18 +01:00

GLGizmoHollow.hpp

Clipping plane is now common for Hollowing and SLA supports gizmos

2020-02-03 15:17:18 +01:00

GLGizmoMove.cpp

ENABLE_GIZMO_ICONS_NON_ACTIVABLE_STATE set as default

2020-01-17 10:34:32 +01:00

GLGizmoMove.hpp

ENABLE_GIZMO_ICONS_NON_ACTIVABLE_STATE set as default

2020-01-17 10:34:32 +01:00

GLGizmoRotate.cpp

ENABLE_GIZMO_ICONS_NON_ACTIVABLE_STATE set as default

2020-01-17 10:34:32 +01:00

GLGizmoRotate.hpp

ENABLE_GIZMO_ICONS_NON_ACTIVABLE_STATE set as default

2020-01-17 10:34:32 +01:00

GLGizmos.hpp

Added new hollowing gizmo

2019-11-05 10:17:27 +01:00

GLGizmoScale.cpp

ENABLE_GIZMO_ICONS_NON_ACTIVABLE_STATE set as default

2020-01-17 10:34:32 +01:00

GLGizmoScale.hpp

Some rework on layout of imgui dialogs

2019-12-11 15:30:25 +01:00

GLGizmoSlaSupports.cpp

Clipping plane is now common for Hollowing and SLA supports gizmos

2020-02-03 15:17:18 +01:00

GLGizmoSlaSupports.hpp

Clipping plane is now common for Hollowing and SLA supports gizmos

2020-02-03 15:17:18 +01:00

GLGizmosManager.cpp

Merge branch 'master' into lm_drilling_backend_rebased

2020-02-03 15:20:16 +01:00

GLGizmosManager.hpp

Switched order of hollowing and support points gizmos

2020-01-09 10:01:21 +01:00