From a13b2b1de3fde7578aaa0771a83994638090bea5 Mon Sep 17 00:00:00 2001 From: Enrico Turri Date: Tue, 9 Apr 2019 11:18:40 +0200 Subject: [PATCH 1/2] Fixed crash when using mouse wheel before the 3D scene is shown (during app startup) --- src/slic3r/GUI/GLCanvas3D.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index b8f7243209..e97b819a03 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -2313,6 +2313,9 @@ void GLCanvas3D::on_key(wxKeyEvent& evt) void GLCanvas3D::on_mouse_wheel(wxMouseEvent& evt) { + if (!m_initialized) + return; + // Ignore the wheel events if the middle button is pressed. if (evt.MiddleIsDown()) return; From 24b8c1fde328cc98524e91fd8bdb89e3c9c084a6 Mon Sep 17 00:00:00 2001 From: Enrico Turri Date: Tue, 9 Apr 2019 11:38:56 +0200 Subject: [PATCH 2/2] Forced one frame render after selecting single volume in objects list --- src/slic3r/GUI/GUI_ObjectList.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index 37d30bbe2b..9b9e1c8ee5 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -2133,6 +2133,7 @@ void ObjectList::update_selections_on_canvas() add_to_selection(item, selection, instance_idx, true); wxGetApp().plater()->canvas3D()->update_gizmos_on_off_state(); + wxGetApp().plater()->canvas3D()->render(); return; }