Enrico Turri c44b6a30f9 Fixed conflicts after merge with master

2019-03-27 12:51:40 +01:00

..

GLGizmoBase.cpp

Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring

2019-03-27 08:33:48 +01:00

GLGizmoBase.hpp

GLCanvas3D::Gizmos as a standalone class (GLGizmosManager)

2019-03-20 13:51:25 +01:00

GLGizmoCut.cpp

Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring

2019-03-27 08:33:48 +01:00

GLGizmoCut.hpp

GLCanvas3D::Selection as a standalone class

2019-03-19 13:30:21 +01:00

GLGizmoFlatten.cpp

GLCanvas3D::Selection as a standalone class

2019-03-19 13:30:21 +01:00

GLGizmoFlatten.hpp

GLCanvas3D::Selection as a standalone class

2019-03-19 13:30:21 +01:00

GLGizmoMove.cpp

Gizmos' grabbers size made uniform as the mean value of the selection's bounding box sides

2019-03-26 14:53:32 +01:00

GLGizmoMove.hpp

GLCanvas3D::Selection as a standalone class

2019-03-19 13:30:21 +01:00

GLGizmoRotate.cpp

Gizmos' grabbers size made uniform as the mean value of the selection's bounding box sides

2019-03-26 14:53:32 +01:00

GLGizmoRotate.hpp

GLCanvas3D::Selection as a standalone class

2019-03-19 13:30:21 +01:00

GLGizmos.hpp

GLCanvas3D::Gizmos as a standalone class (GLGizmosManager)

2019-03-20 13:51:25 +01:00

GLGizmoScale.cpp

Gizmos' grabbers size made uniform as the mean value of the selection's bounding box sides

2019-03-26 14:53:32 +01:00

GLGizmoScale.hpp

GLCanvas3D::Selection as a standalone class

2019-03-19 13:30:21 +01:00

GLGizmoSlaSupports.cpp

1st installment of gizmos refactoring

2019-03-26 09:01:04 +01:00

GLGizmoSlaSupports.hpp

Fixed conflicts after merge with master

2019-03-20 16:09:14 +01:00

GLGizmosManager.cpp

Fixed conflicts after merge with master

2019-03-27 12:51:40 +01:00

GLGizmosManager.hpp

void GLCanvas3D::update_gizmos_data() moved into void GLGizmosManager::update_data(GLCanvas3D& canvas)

2019-03-26 15:55:47 +01:00