From dc94207ddd3cdd8ddcfe887cd328510d2e27e3fb Mon Sep 17 00:00:00 2001
From: Lukas Matena <lukasmatena@seznam.cz>
Date: Fri, 1 Mar 2019 15:03:58 +0100
Subject: [PATCH] Fixed the 'remove all points' button in sla gizmo (was only
 working in editing mode)

---
 src/slic3r/GUI/GLGizmo.cpp | 11 +++++------
 src/slic3r/GUI/GLGizmo.hpp |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/slic3r/GUI/GLGizmo.cpp b/src/slic3r/GUI/GLGizmo.cpp
index 53c82ce8050..4095782c8c4 100644
--- a/src/slic3r/GUI/GLGizmo.cpp
+++ b/src/slic3r/GUI/GLGizmo.cpp
@@ -2178,13 +2178,10 @@ bool GLGizmoSlaSupports::mouse_event(SLAGizmoEventType action, const Vec2d& mous
     return false;
 }
 
-void GLGizmoSlaSupports::delete_selected_points()
+void GLGizmoSlaSupports::delete_selected_points(bool force)
 {
-    if (!m_editing_mode)
-        return;
-
     for (unsigned int idx=0; idx<m_editing_mode_cache.size(); ++idx) {
-        if (m_editing_mode_cache[idx].second && (!m_editing_mode_cache[idx].first.is_new_island || !m_lock_unique_islands)) {
+        if (m_editing_mode_cache[idx].second && (!m_editing_mode_cache[idx].first.is_new_island || !m_lock_unique_islands || force)) {
             m_editing_mode_cache.erase(m_editing_mode_cache.begin() + (idx--));
             m_unsaved_changes = true;
         }
@@ -2403,7 +2400,9 @@ RENDER_AGAIN:
         m_parent.reload_scene(true);
         if (remove_all)
             select_point(AllPoints);
-        delete_selected_points();
+        delete_selected_points(remove_all);
+        if (remove_all && !m_editing_mode)
+            editing_mode_apply_changes();
         if (first_run) {
             first_run = false;
             goto RENDER_AGAIN;
diff --git a/src/slic3r/GUI/GLGizmo.hpp b/src/slic3r/GUI/GLGizmo.hpp
index 383e151ae91..18ddbac69ac 100644
--- a/src/slic3r/GUI/GLGizmo.hpp
+++ b/src/slic3r/GUI/GLGizmo.hpp
@@ -469,7 +469,7 @@ public:
     virtual ~GLGizmoSlaSupports();
     void set_sla_support_data(ModelObject* model_object, const GLCanvas3D::Selection& selection);
     bool mouse_event(SLAGizmoEventType action, const Vec2d& mouse_position, bool shift_down);
-    void delete_selected_points();
+    void delete_selected_points(bool force = false);
 
 private:
     bool on_init();