From 03f2f1478af2aa24a272cc1a2cc2dec9762f58b5 Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Wed, 19 Oct 2022 08:38:50 +0200 Subject: [PATCH] Removed tech DISABLE_MEASURE_GIZMO_FOR_SCALED_VOLUMES --- src/libslic3r/Technologies.hpp | 1 - src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/libslic3r/Technologies.hpp b/src/libslic3r/Technologies.hpp index 817136e7a4..04ecfae670 100644 --- a/src/libslic3r/Technologies.hpp +++ b/src/libslic3r/Technologies.hpp @@ -68,7 +68,6 @@ #define ENABLE_RAYCAST_PICKING_DEBUG (0 && ENABLE_RAYCAST_PICKING) // Enable Measure Gizmo #define ENABLE_MEASURE_GIZMO (1 && ENABLE_RAYCAST_PICKING) -#define DISABLE_MEASURE_GIZMO_FOR_SCALED_VOLUMES (1 && ENABLE_MEASURE_GIZMO) #define ENABLE_MEASURE_GIZMO_DEBUG (0 && ENABLE_MEASURE_GIZMO) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp index fdd94120a4..2eff5bb2ad 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp @@ -425,12 +425,9 @@ bool GLGizmoMeasure::on_is_activable() const bool res = (wxGetApp().preset_bundle->printers.get_edited_preset().printer_technology() == ptSLA) ? selection.is_single_full_instance() : selection.is_single_volume() || selection.is_single_volume_instance(); - if (res) { + if (res) res &= !selection.get_first_volume()->is_sinking(); -#if DISABLE_MEASURE_GIZMO_FOR_SCALED_VOLUMES - res &= Geometry::Transformation(selection.get_first_volume()->world_matrix()).get_scaling_factor().isApprox(Vec3d::Ones()); -#endif // DISABLE_MEASURE_GIZMO_FOR_SCALED_VOLUMES - } + return res; }