From 4078b7eafc7506748410d757564b9bd1f2ffdcfb Mon Sep 17 00:00:00 2001 From: YuSanka Date: Tue, 24 Jan 2023 15:48:13 +0100 Subject: [PATCH] Partially revert for https://github.com/Prusa-Development/PrusaSlicerPrivate/commit/7858b5d3cd9ea1148a1da9ac5a87eb6ea98a7b53 - Merge option is suppressed to cut objects --- src/slic3r/GUI/GUI_ObjectList.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index 54fa624bc..81ec956ee 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -2628,6 +2628,9 @@ void ObjectList::delete_all_connectors_for_object(int obj_idx) bool ObjectList::can_merge_to_multipart_object() const { + if (has_selected_cut_object()) + return false; + wxDataViewItemArray sels; GetSelections(sels); if (sels.IsEmpty())