From 52f51ba75792b2d3406a6fa3003e44ab28df8aea Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Tue, 13 Oct 2020 16:04:57 +0200 Subject: [PATCH] Small fix to a374cb1e62968f6e0f9cd3fd8b978c991ac6ba4c --- src/slic3r/GUI/Plater.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index f9bfb2c3af..ae6ebf9123 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -1908,9 +1908,15 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame) sidebar->Bind(wxEVT_COMBOBOX, &priv::on_select_preset, this); sidebar->Bind(EVT_OBJ_LIST_OBJECT_SELECT, [this](wxEvent&) { priv::selection_changed(); }); sidebar->Bind(EVT_SCHEDULE_BACKGROUND_PROCESS, [this](SimpleEvent&) { this->schedule_background_process(); }); +#if ENABLE_GCODE_VIEWER + } +#endif // ENABLE_GCODE_VIEWER - wxGLCanvas* view3D_canvas = view3D->get_wxglcanvas(); + wxGLCanvas* view3D_canvas = view3D->get_wxglcanvas(); +#if ENABLE_GCODE_VIEWER + if (wxGetApp().is_editor()) { +#endif // ENABLE_GCODE_VIEWER // 3DScene events: view3D_canvas->Bind(EVT_GLCANVAS_SCHEDULE_BACKGROUND_PROCESS, [this](SimpleEvent&) { this->schedule_background_process(); }); view3D_canvas->Bind(EVT_GLCANVAS_OBJECT_SELECT, &priv::on_object_select, this); @@ -1952,10 +1958,10 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame) view3D_canvas->Bind(EVT_GLTOOLBAR_SPLIT_OBJECTS, &priv::on_action_split_objects, this); view3D_canvas->Bind(EVT_GLTOOLBAR_SPLIT_VOLUMES, &priv::on_action_split_volumes, this); view3D_canvas->Bind(EVT_GLTOOLBAR_LAYERSEDITING, &priv::on_action_layersediting, this); - view3D_canvas->Bind(EVT_GLCANVAS_UPDATE_BED_SHAPE, [q](SimpleEvent&) { q->set_bed_shape(); }); #if ENABLE_GCODE_VIEWER } #endif // ENABLE_GCODE_VIEWER + view3D_canvas->Bind(EVT_GLCANVAS_UPDATE_BED_SHAPE, [q](SimpleEvent&) { q->set_bed_shape(); }); // Preview events: preview->get_wxglcanvas()->Bind(EVT_GLCANVAS_QUESTION_MARK, [this](SimpleEvent&) { wxGetApp().keyboard_shortcuts(); });