Enrico Turri b368f8ff24 Fixed conflicts after merge with master

2020-01-17 14:58:19 +01:00

..

GLGizmoBase.cpp

Follow-up of 32dc4709a4 -> A more general fix

2019-08-26 09:06:21 +02:00

GLGizmoBase.hpp

Started an attempt to refactor GLGizmoManager

2019-09-02 14:30:12 +02:00

GLGizmoCut.cpp

Fixed positioning of gizmos' imgui dialogs

2019-12-12 13:38:08 +01:00

GLGizmoCut.hpp

Finished picking by color with a checksum in the alpha channel

2019-08-07 14:15:38 +02:00

GLGizmoFlatten.cpp

Finished picking by color with a checksum in the alpha channel

2019-08-07 14:15:38 +02:00

GLGizmoFlatten.hpp

Nearly finished refactoring of GLGizmoManager

2019-09-02 14:30:15 +02: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

Renamed MeshClipper.cpp/.hpp to MeshUtils.cpp/.hpp

2019-09-13 12:03:53 +02: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

Fixed positioning of gizmos' imgui dialogs

2019-12-12 13:38:08 +01:00

GLGizmoSlaSupports.hpp

MeshUtils.cpp: MeshRaycaster is now aware of the clipping plane

2019-09-24 12:58:12 +02:00

GLGizmosManager.cpp

Fixed conflicts after merge with master

2020-01-17 14:58:19 +01:00

GLGizmosManager.hpp

Refactoring in GLGizmosManager to simplify code

2019-12-12 11:11:11 +01:00