From 94b98e349b65bf3b85839175daffa018ebe5eeaa Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Thu, 24 Mar 2022 10:10:17 +0100 Subject: [PATCH] Tech ENABLE_NEW_RECTANGLE_SELECTION - Fixed SHIFT + left mouse selection/deselection --- src/slic3r/GUI/GLCanvas3D.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 709b77d5b..6535be25c 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -3438,6 +3438,7 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt) #endif // !ENABLE_NEW_RECTANGLE_SELECTION else { #if ENABLE_NEW_RECTANGLE_SELECTION + const bool rectangle_selection_dragging = m_rectangle_selection.is_dragging(); if (evt.LeftDown() && (evt.ShiftDown() || evt.AltDown()) && m_picking_enabled) { if (m_gizmos.get_current_type() != GLGizmosManager::SlaSupports && m_gizmos.get_current_type() != GLGizmosManager::FdmSupports && @@ -3454,8 +3455,7 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt) // during the scene manipulation. #if ENABLE_NEW_RECTANGLE_SELECTION - if (m_picking_enabled && (!any_gizmo_active || !evt.ShiftDown()) && (!m_hover_volume_idxs.empty() || !is_layers_editing_enabled()) && - !m_rectangle_selection.is_dragging()) { + if (m_picking_enabled && !any_gizmo_active && (!m_hover_volume_idxs.empty() || !is_layers_editing_enabled()) && !rectangle_selection_dragging) { #else if (m_picking_enabled && (!any_gizmo_active || !evt.CmdDown()) && (!m_hover_volume_idxs.empty() || !is_layers_editing_enabled())) { #endif // ENABLE_NEW_RECTANGLE_SELECTION