diff options
author | Enrico Turri <enricoturri@seznam.cz> | 2020-03-10 15:02:39 +0300 |
---|---|---|
committer | Enrico Turri <enricoturri@seznam.cz> | 2020-03-10 15:02:39 +0300 |
commit | a6a9ab9dc7efda2dce6745778f6198d34ed800e8 (patch) | |
tree | fde57ad0ed1831399b22d83b0d9eefe3e8e0c4f7 /src/slic3r/GUI/Plater.cpp | |
parent | 33470f7f6d67306de247717a926bc4eef9cece78 (diff) |
Follow-up of 6c36577e8e48e27a372f9a53cd2ba2a07e3a49a3 -> World Z axis set to vertical when disconnecting 3d mouse
Diffstat (limited to 'src/slic3r/GUI/Plater.cpp')
-rw-r--r-- | src/slic3r/GUI/Plater.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index d7d6f419d..0beddc358 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -2277,11 +2277,7 @@ void Plater::priv::update_ui_from_settings() camera.set_type(wxGetApp().app_config->get("use_perspective_camera")); if (wxGetApp().app_config->get("use_free_camera") != "1") - { - // forces camera right vector to be parallel to XY plane - if (std::abs(camera.get_dir_right()(2)) > EPSILON) - camera.look_at(camera.get_position(), camera.get_target(), Vec3d::UnitZ()); - } + camera.recover_from_free_camera(); view3D->get_canvas3d()->update_ui_from_settings(); preview->get_canvas3d()->update_ui_from_settings(); @@ -5661,6 +5657,11 @@ const Camera& Plater::get_camera() const return p->camera; } +Camera& Plater::get_camera() +{ + return p->camera; +} + const Mouse3DController& Plater::get_mouse3d_controller() const { return p->mouse3d_controller; |