From 8057a70b116df303d75535446ac4d69f6973c260 Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Fri, 14 Jan 2022 11:59:08 +0100 Subject: [PATCH 1/2] Fixed conflicts after merge with dev branch --- src/libslic3r/Technologies.hpp | 7 ------- src/slic3r/GUI/Selection.cpp | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/libslic3r/Technologies.hpp b/src/libslic3r/Technologies.hpp index 5a749eea91..13bba02882 100644 --- a/src/libslic3r/Technologies.hpp +++ b/src/libslic3r/Technologies.hpp @@ -58,13 +58,6 @@ #define ENABLE_PREVIEW_LAYER_TIME (1 && ENABLE_2_5_0_ALPHA1) // Enable showing time estimate for travel moves in legend #define ENABLE_TRAVEL_TIME (1 && ENABLE_2_5_0_ALPHA1) - - -//==================== -// 2.5.0.alpha1 techs -//==================== -#define ENABLE_2_5_0_ALPHA1 1 - // Enable editing volumes transformation in world coordinates and instances in local coordinates #define ENABLE_WORLD_COORDINATE (1 && ENABLE_2_5_0_ALPHA1) // Enable showing world coordinates of volumes' offset relative to the instance containing them diff --git a/src/slic3r/GUI/Selection.cpp b/src/slic3r/GUI/Selection.cpp index ed040b2bbc..0183cdb48a 100644 --- a/src/slic3r/GUI/Selection.cpp +++ b/src/slic3r/GUI/Selection.cpp @@ -2081,7 +2081,7 @@ void Selection::render_sidebar_position_hints(const std::string& sidebar_field) void Selection::render_sidebar_rotation_hints(const std::string& sidebar_field) const { - auto render_sidebar_rotation_hint = [this](const std::array& color) { + auto render_sidebar_rotation_hint = [this](const ColorRGBA& color) { const_cast(&m_curved_arrow)->set_color(-1, color); m_curved_arrow.render(); glsafe(::glRotated(180.0, 0.0, 0.0, 1.0)); From 0d36d3a01646fbc9021445c28f038cebf405752a Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Fri, 14 Jan 2022 14:14:16 +0100 Subject: [PATCH 2/2] Fixed warnings --- 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 e3c60745f6..74063ce960 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp @@ -124,8 +124,6 @@ void GLGizmoMove3D::on_render() if (!m_cone.is_initialized()) m_cone.init_from(its_make_cone(1.0, 1.0, double(PI) / 18.0)); - const Selection& selection = m_parent.get_selection(); - glsafe(::glClear(GL_DEPTH_BUFFER_BIT)); glsafe(::glEnable(GL_DEPTH_TEST)); diff --git a/src/slic3r/GUI/Selection.cpp b/src/slic3r/GUI/Selection.cpp index 0183cdb48a..a59e0714ee 100644 --- a/src/slic3r/GUI/Selection.cpp +++ b/src/slic3r/GUI/Selection.cpp @@ -611,7 +611,7 @@ bool Selection::requires_uniform_scale() const if (!Geometry::is_rotation_ninety_degrees(Geometry::Transformation(get_volume(*m_list.begin())->world_matrix()).get_rotation())) { if (reason != nullptr) *reason = EUniformScaleRequiredReason::VolumeNotAxisAligned_World; - return true; + return true; } } else if (coord_type == ECoordinatesType::Instance) { @@ -626,7 +626,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())) { @@ -655,12 +655,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; + } #endif // ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES return true;