From fdc8a51d3ceb1d512bb16390211de34e1e81ac6e Mon Sep 17 00:00:00 2001
From: enricoturri1966 <enricoturri@seznam.cz>
Date: Wed, 3 Nov 2021 15:01:24 +0100
Subject: [PATCH] Tech ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES - Fixed
 orientation for sidebar hints in 3D scene for part manipulation in instance
 and local systems

Fixed conflicts during rebase with master
---
 src/slic3r/GUI/Plater.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index 94bae6708f..da167f7d38 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -1514,6 +1514,11 @@ void Sidebar::update_mode()
 
     wxWindowUpdateLocker noUpdates(this);
 
+#if ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES
+    if (m_mode == comSimple)
+        p->object_manipulation->set_coordinates_type(ObjectManipulation::ECoordinatesType::World);
+#endif // ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES
+
     p->object_list->get_sizer()->Show(m_mode > comSimple);
 
     p->object_list->unselect_objects();