From 2138e98af9f872cf92d2cc699feacfd9e23b4c97 Mon Sep 17 00:00:00 2001
From: "zhou.xu" <zhou.xu@bambulab.com>
Date: Sun, 18 Feb 2024 10:02:48 +0800
Subject: [PATCH] FIX: ban shift and ctrl function on paint mode

Jira: STUDIO-6241
Change-Id: I553ee6dadbd4735bedb521690f4a32e28088a3a9
---
 src/slic3r/GUI/GUI_ObjectList.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp
index 96a26c9d3..de0e56a1f 100644
--- a/src/slic3r/GUI/GUI_ObjectList.cpp
+++ b/src/slic3r/GUI/GUI_ObjectList.cpp
@@ -139,14 +139,15 @@ ObjectList::ObjectList(wxWindow* parent) :
 		// Workaround for entering the column editing mode on Windows. Simulate keyboard enter when another column of the active line is selected.
 		int new_selected_column = -1;
 #endif //__WXMSW__
+        GLGizmosManager &gizmos_mgr = wxGetApp().plater()->get_view3D_canvas3D()->get_gizmos_manager();
+        if ((wxGetKeyState(WXK_SHIFT) || wxGetKeyState(WXK_CONTROL)) 
+            && gizmos_mgr.is_gizmo_activable_when_single_full_instance()) {
+            // selection will not be single_full_instance after shift_pressed,Caused exe crashed
+            UnselectAll();
+            Select(m_last_selected_item);
+            return;
+        }
         if (wxGetKeyState(WXK_SHIFT)) {
-            GLGizmosManager &gizmos_mgr = wxGetApp().plater()->get_view3D_canvas3D()->get_gizmos_manager();
-            if (gizmos_mgr.is_gizmo_activable_when_single_full_instance()) {
-                // selection will not be single_full_instance after shift_pressed,Caused exe crashed
-                UnselectAll();
-                Select(m_last_selected_item);
-                return;
-            }
             wxDataViewItemArray sels;
             GetSelections(sels);
             if (! sels.empty() && sels.front() == m_last_selected_item)