From ac5f49ad73d39dc24aaa24f10f53ee81022e3e6c Mon Sep 17 00:00:00 2001 From: "zhou.xu" Date: Tue, 17 Dec 2024 14:15:03 +0800 Subject: [PATCH] FIX:ban reload scene in preview by left ui jira: STUDIO-9228 Change-Id: I8a9a6eb8a7e81cc3cd912dcbc87b59fab4887245 (cherry picked from commit 0098b8a347e9d36b4ee45df126dffd87ce6b4bdc) --- src/slic3r/GUI/GUI_ObjectList.cpp | 3 +++ src/slic3r/GUI/GUI_Preview.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index 2e2bb272ce..05b0b48dee 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -1427,6 +1427,9 @@ void ObjectList::list_manipulation(const wxPoint& mouse_pos, bool evt_context_me else if (col_num == colSinking) { Plater * plater = wxGetApp().plater(); GLCanvas3D *cnv = plater->canvas3D(); + if (cnv->get_canvas_type() == GLCanvas3D::ECanvasType::CanvasPreview) {//ban reload_scene in Preview scene + return; + } int obj_idx, vol_idx; get_selected_item_indexes(obj_idx, vol_idx, item); if (obj_idx != -1) { diff --git a/src/slic3r/GUI/GUI_Preview.cpp b/src/slic3r/GUI/GUI_Preview.cpp index 978a0e3cab..1dcdbe350d 100644 --- a/src/slic3r/GUI/GUI_Preview.cpp +++ b/src/slic3r/GUI/GUI_Preview.cpp @@ -265,7 +265,7 @@ bool Preview::init(wxWindow* parent, Bed3D& bed, Model* model) m_canvas->set_process(m_process); m_canvas->set_type(GLCanvas3D::ECanvasType::CanvasPreview); m_canvas->enable_legend_texture(true); - m_canvas->enable_dynamic_background(true); + //BBS: GUI refactor: GLToolbar if (wxGetApp().is_editor()) { m_canvas->enable_select_plate_toolbar(true);