Skip to content

Commit

Permalink
Fix of #1645
Browse files Browse the repository at this point in the history
  • Loading branch information
enricoturri1966 committed Jan 14, 2019
1 parent 01dc8e7 commit 6094512
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
12 changes: 10 additions & 2 deletions src/slic3r/GUI/GLCanvas3D.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4662,11 +4662,19 @@ void GLCanvas3D::reload_scene(bool refresh_immediately, bool force_full_scene_re
m_camera.set_scene_box(scene_bounding_box(), *this);
m_camera.set_target(m_camera.get_target(), *this);

// if no object is selected, deactivate active gizmo, if any
// otherwise it will be shown after cleaning the scene (while it is active)
if (m_selection.is_empty())
{
// If no object is selected, deactivate the active gizmo, if any
// Otherwise it may be shown after cleaning the scene (if it was active while the objects were deleted)
m_gizmos.reset_all_states();

// If no object is selected, reset the objects manipulator on the sidebar
// to force a reset of its cache
auto manip = wxGetApp().obj_manipul();
if (manip != nullptr)
manip->update_settings_value(m_selection);
}

// and force this canvas to be redrawn.
m_dirty = true;
}
Expand Down
3 changes: 2 additions & 1 deletion src/slic3r/GUI/GUI_App.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,8 @@ Sidebar& GUI_App::sidebar()

ObjectManipulation* GUI_App::obj_manipul()
{
return sidebar().obj_manipul();
// If this method is called before plater_ has been initialized, return nullptr (to avoid a crash)
return (plater_ != nullptr) ? sidebar().obj_manipul() : nullptr;
}

ObjectSettings* GUI_App::obj_settings()
Expand Down

0 comments on commit 6094512

Please sign in to comment.