From 9b8a68565f2a7835e3630e006fe43df8dba7f0c0 Mon Sep 17 00:00:00 2001
From: Enrico Turri <enricoturri@seznam.cz>
Date: Wed, 2 Jan 2019 14:04:26 +0100
Subject: [PATCH] Modified camera target behavior set as default

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

diff --git a/src/libslic3r/Technologies.hpp b/src/libslic3r/Technologies.hpp
index 5c35199e7..84bd7fc99 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)
 // Disable synchronization of unselected instances
 #define DISABLE_INSTANCES_SYNCH (0 && ENABLE_1_42_0)
-// Modified camera target behavior
-#define ENABLE_MODIFIED_CAMERA_TARGET (1 && ENABLE_1_42_0)
 // Keeps objects on bed while scaling them using the scale gizmo
 #define ENABLE_ENSURE_ON_BED_WHILE_SCALING (1 && ENABLE_1_42_0)
 // All rotations made using the rotate gizmo are done with respect to the world reference system
diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index f5615f0d6..feaf14f98 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -4041,13 +4041,11 @@ void GLCanvas3D::zoom_to_volumes()
     m_apply_zoom_to_volumes_filter = false;
 }
 
-#if ENABLE_MODIFIED_CAMERA_TARGET
 void GLCanvas3D::zoom_to_selection()
 {
     if (!m_selection.is_empty())
         _zoom_to_bounding_box(m_selection.get_bounding_box());
 }
-#endif // ENABLE_MODIFIED_CAMERA_TARGET
 
 void GLCanvas3D::select_view(const std::string& direction)
 {
@@ -4827,7 +4825,6 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
                 // key O/o
                 case 79:
                 case 111: { set_camera_zoom(-1.0f); break; }
-#if ENABLE_MODIFIED_CAMERA_TARGET
                 // key Z/z
                 case 90:
                 case 122:
@@ -4839,11 +4836,6 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
 
                     break;
                 }
-#else
-                // key Z/z
-                case 90:
-                case 122: { zoom_to_volumes(); break; }
-#endif // ENABLE_MODIFIED_CAMERA_TARGET
                 default:
                 {
                     if (m_gizmos.handle_shortcut(keyCode, m_selection))
diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp
index d7c60f990..6a1ccc45e 100644
--- a/src/slic3r/GUI/GLCanvas3D.hpp
+++ b/src/slic3r/GUI/GLCanvas3D.hpp
@@ -918,9 +918,7 @@ public:
 
     void zoom_to_bed();
     void zoom_to_volumes();
-#if ENABLE_MODIFIED_CAMERA_TARGET
     void zoom_to_selection();
-#endif // ENABLE_MODIFIED_CAMERA_TARGET
     void select_view(const std::string& direction);
     void set_viewport_from_scene(const GLCanvas3D& other);
 
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index db052c6f1..82fa99bac 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -1571,9 +1571,6 @@ std::vector<size_t> Plater::priv::load_model_objects(const ModelObjectPtrs &mode
     }
 
     update();
-#if !ENABLE_MODIFIED_CAMERA_TARGET
-    this->canvas3D->zoom_to_volumes();
-#endif // !ENABLE_MODIFIED_CAMERA_TARGET
     object_list_changed();
 
     this->schedule_background_process();
@@ -3348,11 +3345,6 @@ void Plater::changed_object(int obj_idx)
 
     // update print
     this->p->schedule_background_process();
-    if (list->is_parts_changed() || list->is_part_settings_changed()) {
-#if !ENABLE_MODIFIED_CAMERA_TARGET
-        p->canvas3D->zoom_to_volumes();
-#endif // !ENABLE_MODIFIED_CAMERA_TARGET
-    }
 }
 
 void Plater::fix_through_netfabb(const int obj_idx) { p->fix_through_netfabb(obj_idx); }