Fixed conflicts after merge with master

2019-03-27 12:51:40 +01:00
parent 000542f48d 3cd6db2278
commit c44b6a30f9
2 changed files with 6 additions and 0 deletions
--- a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
@@ -663,6 +663,11 @@ bool GLGizmosManager::on_mouse(wxMouseEvent& evt, GLCanvas3D& canvas)
            gizmo_event(SLAGizmoEventType::LeftUp, mouse_pos, evt.ShiftDown());
            processed = true;
        }
+        else if (evt.LeftUp() && (m_current == Flatten) && ((canvas.get_hover_volume_id() != -1) || grabber_contains_mouse()))
+        {
+            // to avoid to loose the selection when user clicks an object while the Flatten gizmo is active
+            processed = true;
+        }
    }
    else
    {