Follow-up of 6c36577e8e -> World Z axis set to vertical when disconnecting 3d mouse

This commit is contained in:
Enrico Turri 2020-03-10 13:02:39 +01:00
parent 33470f7f6d
commit a6a9ab9dc7
4 changed files with 21 additions and 6 deletions

View file

@ -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;