diff options
author | bubnikv <bubnikv@gmail.com> | 2019-05-03 13:36:26 +0300 |
---|---|---|
committer | bubnikv <bubnikv@gmail.com> | 2019-05-03 13:36:26 +0300 |
commit | 0ab96ed6b5786eda18b7cceb4f7c695cd61065ee (patch) | |
tree | a6c520e9314f1a4a29897570c0e17c815401926f /src/slic3r/GUI/3DScene.cpp | |
parent | f2bb070ab94b01bd2a0c6b63bd37a8ff800ad4b4 (diff) |
Changed the "non-uniform scaling is not possible" message.
Diffstat (limited to 'src/slic3r/GUI/3DScene.cpp')
-rw-r--r-- | src/slic3r/GUI/3DScene.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/slic3r/GUI/3DScene.cpp b/src/slic3r/GUI/3DScene.cpp index bbedc0802..c5ede9792 100644 --- a/src/slic3r/GUI/3DScene.cpp +++ b/src/slic3r/GUI/3DScene.cpp @@ -362,19 +362,18 @@ const BoundingBoxf3& GLVolume::transformed_bounding_box() const const BoundingBoxf3& GLVolume::transformed_convex_hull_bounding_box() const { - if (m_transformed_convex_hull_bounding_box_dirty) - { - if ((m_convex_hull != nullptr) && (m_convex_hull->stl.stats.number_of_facets > 0)) - m_transformed_convex_hull_bounding_box = m_convex_hull->transformed_bounding_box(world_matrix()); - else - m_transformed_convex_hull_bounding_box = bounding_box.transformed(world_matrix()); - - m_transformed_convex_hull_bounding_box_dirty = false; - } - + if (m_transformed_convex_hull_bounding_box_dirty) + m_transformed_convex_hull_bounding_box = this->transformed_convex_hull_bounding_box(world_matrix()); return m_transformed_convex_hull_bounding_box; } +BoundingBoxf3 GLVolume::transformed_convex_hull_bounding_box(const Transform3d &trafo) const +{ + return (m_convex_hull != nullptr && m_convex_hull->stl.stats.number_of_facets > 0) ? + m_convex_hull->transformed_bounding_box(trafo) : + bounding_box.transformed(trafo); +} + void GLVolume::set_range(double min_z, double max_z) { this->qverts_range.first = 0; |