diff options
author | bubnikv <bubnikv@gmail.com> | 2018-09-20 17:48:40 +0300 |
---|---|---|
committer | bubnikv <bubnikv@gmail.com> | 2018-09-20 17:48:40 +0300 |
commit | 20d0f046d2d75468dcb193f84d73ea8522e10c33 (patch) | |
tree | 9e1d49a349a8078079492e886be465a4ed6ee0d8 /src/slic3r/GUI/GLCanvas3DManager.cpp | |
parent | add45a8f6e656fdf4af2cfe5d5ce82457e08e2be (diff) | |
parent | 07274589a35948e135ccb2eed59626a41c61444b (diff) |
Merge remote-tracking branch 'origin/dev2' into dev_nativeversion_1.42.0-alpha
Diffstat (limited to 'src/slic3r/GUI/GLCanvas3DManager.cpp')
-rw-r--r-- | src/slic3r/GUI/GLCanvas3DManager.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/slic3r/GUI/GLCanvas3DManager.cpp b/src/slic3r/GUI/GLCanvas3DManager.cpp index 495f49425..1ac588f6c 100644 --- a/src/slic3r/GUI/GLCanvas3DManager.cpp +++ b/src/slic3r/GUI/GLCanvas3DManager.cpp @@ -699,6 +699,21 @@ void GLCanvas3DManager::register_on_gizmo_scale_uniformly_callback(wxGLCanvas* c it->second->register_on_gizmo_scale_uniformly_callback(callback); } +#if ENABLE_MODELINSTANCE_3D_ROTATION +void GLCanvas3DManager::register_on_gizmo_rotate_3D_callback(wxGLCanvas* canvas, void* callback) +{ + CanvasesMap::iterator it = _get_canvas(canvas); + if (it != m_canvases.end()) + it->second->register_on_gizmo_rotate_3D_callback(callback); +} + +void GLCanvas3DManager::register_on_gizmo_flatten_3D_callback(wxGLCanvas* canvas, void* callback) +{ + CanvasesMap::iterator it = _get_canvas(canvas); + if (it != m_canvases.end()) + it->second->register_on_gizmo_flatten_3D_callback(callback); +} +#else void GLCanvas3DManager::register_on_gizmo_rotate_callback(wxGLCanvas* canvas, void* callback) { CanvasesMap::iterator it = _get_canvas(canvas); @@ -712,6 +727,7 @@ void GLCanvas3DManager::register_on_gizmo_flatten_callback(wxGLCanvas* canvas, v if (it != m_canvases.end()) it->second->register_on_gizmo_flatten_callback(callback); } +#endif // ENABLE_MODELINSTANCE_3D_ROTATION void GLCanvas3DManager::register_on_update_geometry_info_callback(wxGLCanvas* canvas, void* callback) { |