diff options
author | enricoturri1966 <enricoturri@seznam.cz> | 2022-05-05 09:48:31 +0300 |
---|---|---|
committer | enricoturri1966 <enricoturri@seznam.cz> | 2022-06-06 09:55:38 +0300 |
commit | c8d93e69beab268681329a8132814b97e4957faf (patch) | |
tree | 1008172bedb353788efdbff8f0420f4d5f275d79 /src/slic3r/GUI | |
parent | f9f7e6e75995165cf8485cab506ada6522233d5b (diff) |
Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Reworked method void Selection::synchronize_unselected_volumes() to use the new matrix only implementation of Geometry::Transformation
Fixed conflicts during rebase with master
Diffstat (limited to 'src/slic3r/GUI')
-rw-r--r-- | src/slic3r/GUI/Selection.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/slic3r/GUI/Selection.cpp b/src/slic3r/GUI/Selection.cpp index e2a5b4a9d..b94c2eb38 100644 --- a/src/slic3r/GUI/Selection.cpp +++ b/src/slic3r/GUI/Selection.cpp @@ -3131,10 +3131,14 @@ void Selection::synchronize_unselected_volumes() #endif // ENABLE_WIPETOWER_OBJECTID_1000_REMOVAL
const int volume_idx = volume->volume_idx();
+#if ENABLE_TRANSFORMATIONS_BY_MATRICES
+ const Geometry::Transformation& trafo = volume->get_volume_transformation();
+#else
const Vec3d& offset = volume->get_volume_offset();
const Vec3d& rotation = volume->get_volume_rotation();
const Vec3d& scaling_factor = volume->get_volume_scaling_factor();
const Vec3d& mirror = volume->get_volume_mirror();
+#endif // ENABLE_TRANSFORMATIONS_BY_MATRICES
// Process unselected volumes.
for (unsigned int j = 0; j < (unsigned int)m_volumes->size(); ++j) {
@@ -3145,10 +3149,14 @@ void Selection::synchronize_unselected_volumes() if (v->object_idx() != object_idx || v->volume_idx() != volume_idx)
continue;
+#if ENABLE_TRANSFORMATIONS_BY_MATRICES
+ v->set_volume_transformation(trafo);
+#else
v->set_volume_offset(offset);
v->set_volume_rotation(rotation);
v->set_volume_scaling_factor(scaling_factor);
v->set_volume_mirror(mirror);
+#endif // ENABLE_TRANSFORMATIONS_BY_MATRICES
}
}
}
|