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.hpp | |
| 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.hpp')
| -rw-r--r-- | src/slic3r/GUI/GLCanvas3DManager.hpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/slic3r/GUI/GLCanvas3DManager.hpp b/src/slic3r/GUI/GLCanvas3DManager.hpp index 4922b6171..2331ec3f5 100644 --- a/src/slic3r/GUI/GLCanvas3DManager.hpp +++ b/src/slic3r/GUI/GLCanvas3DManager.hpp @@ -163,8 +163,13 @@ public: void register_on_wipe_tower_moved_callback(wxGLCanvas* canvas, void* callback); void register_on_enable_action_buttons_callback(wxGLCanvas* canvas, void* callback); void register_on_gizmo_scale_uniformly_callback(wxGLCanvas* canvas, void* callback); +#if ENABLE_MODELINSTANCE_3D_ROTATION + void register_on_gizmo_rotate_3D_callback(wxGLCanvas* canvas, void* callback); + void register_on_gizmo_flatten_3D_callback(wxGLCanvas* canvas, void* callback); +#else void register_on_gizmo_rotate_callback(wxGLCanvas* canvas, void* callback); void register_on_gizmo_flatten_callback(wxGLCanvas* canvas, void* callback); +#endif // ENABLE_MODELINSTANCE_3D_ROTATION void register_on_update_geometry_info_callback(wxGLCanvas* canvas, void* callback); void register_action_add_callback(wxGLCanvas* canvas, void* callback); |