From cd4704e493171f2dd1066044ca1073e6d078d457 Mon Sep 17 00:00:00 2001
From: enricoturri1966 <enricoturri@seznam.cz>
Date: Fri, 14 Jan 2022 14:14:16 +0100
Subject: [PATCH] Fixed warnings

Fixed conflicts during rebase with master
---
 src/slic3r/GUI/Gizmos/GLGizmoMove.cpp | 2 --
 src/slic3r/GUI/Selection.cpp          | 6 ++++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
index f024bcbe49..bed9f8d11f 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
@@ -153,8 +153,6 @@ void GLGizmoMove3D::on_render()
     glsafe(::glClear(GL_DEPTH_BUFFER_BIT));
     glsafe(::glEnable(GL_DEPTH_TEST));
 
-    const Selection& selection = m_parent.get_selection();
-
 #if ENABLE_WORLD_COORDINATE
     glsafe(::glPushMatrix());
     calc_selection_box_and_center();
diff --git a/src/slic3r/GUI/Selection.cpp b/src/slic3r/GUI/Selection.cpp
index 2ee0086ab7..9ec69001ff 100644
--- a/src/slic3r/GUI/Selection.cpp
+++ b/src/slic3r/GUI/Selection.cpp
@@ -623,7 +623,7 @@ bool Selection::requires_uniform_scale() const
 #else
         return !Geometry::is_rotation_ninety_degrees(Geometry::Transformation(get_volume(*m_list.begin())->world_matrix()).get_rotation());
 #endif // ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES
-    else if (is_single_full_instance())
+    else if (is_single_full_instance()) {
 #if ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES
         if (coord_type == ECoordinatesType::World) {
             if (!Geometry::is_rotation_ninety_degrees(get_volume(*m_list.begin())->get_instance_rotation())) {
@@ -652,12 +652,14 @@ bool Selection::requires_uniform_scale() const
             }
             return false;
         }
+    }
 
     if (reason != nullptr)
         *reason = EUniformScaleRequiredReason::MultipleSelection;
 #else
         return wxGetApp().obj_manipul()->get_world_coordinates() ?
-        !Geometry::is_rotation_ninety_degrees(get_volume(*m_list.begin())->get_instance_rotation()) : false;
+            !Geometry::is_rotation_ninety_degrees(get_volume(*m_list.begin())->get_instance_rotation()) : false;
+    }
 #endif // ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES
 
     return true;