From 060fac5e55f8824ab12988c02bcef40be7e22df8 Mon Sep 17 00:00:00 2001
From: Enrico Turri <enricoturri@seznam.cz>
Date: Mon, 21 Jan 2019 11:46:06 +0100
Subject: [PATCH] Ensure object on bed while scaling set as default

---
 src/libslic3r/Technologies.hpp | 2 --
 src/slic3r/GUI/GLCanvas3D.cpp  | 4 ----
 src/slic3r/GUI/GLCanvas3D.hpp  | 2 --
 3 files changed, 8 deletions(-)

diff --git a/src/libslic3r/Technologies.hpp b/src/libslic3r/Technologies.hpp
index c2721db4d..7a8e440d0 100644
--- a/src/libslic3r/Technologies.hpp
+++ b/src/libslic3r/Technologies.hpp
@@ -19,8 +19,6 @@
 #define ENABLE_USE_UNIQUE_GLCONTEXT (1 && ENABLE_1_42_0_ALPHA1)
 // Disable synchronization of unselected instances
 #define DISABLE_INSTANCES_SYNCH (0 && ENABLE_1_42_0_ALPHA1)
-// Keeps objects on bed while scaling them using the scale gizmo
-#define ENABLE_ENSURE_ON_BED_WHILE_SCALING (1 && ENABLE_1_42_0_ALPHA1)
 // All rotations made using the rotate gizmo are done with respect to the world reference system
 #define ENABLE_WORLD_ROTATIONS (1 && ENABLE_1_42_0_ALPHA1)
 // Scene's GUI made using imgui library
diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index 24998cd60..21ba33367 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -1857,9 +1857,7 @@ void GLCanvas3D::Selection::scale(const Vec3d& scale, bool local)
         _synchronize_unselected_volumes();
 #endif // !DISABLE_INSTANCES_SYNCH
 
-#if ENABLE_ENSURE_ON_BED_WHILE_SCALING
     _ensure_on_bed();
-#endif // ENABLE_ENSURE_ON_BED_WHILE_SCALING
 
     m_bounding_box_dirty = true;
 }
@@ -2758,7 +2756,6 @@ void GLCanvas3D::Selection::_synchronize_unselected_volumes()
     }
 }
 
-#if ENABLE_ENSURE_ON_BED_WHILE_SCALING
 void GLCanvas3D::Selection::_ensure_on_bed()
 {
     typedef std::map<std::pair<int, int>, double> InstancesToZMap;
@@ -2786,7 +2783,6 @@ void GLCanvas3D::Selection::_ensure_on_bed()
             volume->set_instance_offset(Z, volume->get_instance_offset(Z) - it->second);
     }
 }
-#endif // ENABLE_ENSURE_ON_BED_WHILE_SCALING
 
 const float GLCanvas3D::Gizmos::OverlayIconsScale = 1.0f;
 const float GLCanvas3D::Gizmos::OverlayBorder = 5.0f;
diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp
index 6c6ea9af8..78ad7663a 100644
--- a/src/slic3r/GUI/GLCanvas3D.hpp
+++ b/src/slic3r/GUI/GLCanvas3D.hpp
@@ -652,9 +652,7 @@ public:
 #endif // ENABLE_SIDEBAR_VISUAL_HINTS
         void _synchronize_unselected_instances(bool including_z = false);
         void _synchronize_unselected_volumes();
-#if ENABLE_ENSURE_ON_BED_WHILE_SCALING
         void _ensure_on_bed();
-#endif // ENABLE_ENSURE_ON_BED_WHILE_SCALING
     };
 
     class ClippingPlane