3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix of scaling modifiers for a sinking object

Browse source
This commit is contained in:
enricoturri1966 2021-07-29 09:37:40 +02:00
parent 14a67b0c9e
commit 1d4e7f5577
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/slic3r/GUI/Selection.cpp
View file

@ -841,8 +841,19 @@ void Selection::scale(const Vec3d& scale, TransformationType transformation_type
for (unsigned int i : m_list) { for (unsigned int i : m_list) {
GLVolume &volume = *(*m_volumes)[i]; GLVolume &volume = *(*m_volumes)[i];
if (!is_sla) if (!is_sla) {
is_any_volume_sinking |= !volume.is_modifier && std::find(m_cache.sinking_volumes.begin(), m_cache.sinking_volumes.end(), i) != m_cache.sinking_volumes.end(); if (volume.is_modifier) {
int object_idx = volume.object_idx();
for (unsigned int id : m_cache.sinking_volumes) {
const GLVolume& v = *(*m_volumes)[id];
is_any_volume_sinking |= v.object_idx() == object_idx && v.is_sinking();
if (is_any_volume_sinking)
break;
}
}
else
is_any_volume_sinking |= std::find(m_cache.sinking_volumes.begin(), m_cache.sinking_volumes.end(), i) != m_cache.sinking_volumes.end();
}
if (is_single_full_instance()) { if (is_single_full_instance()) {
if (transformation_type.relative()) { if (transformation_type.relative()) {
Transform3d m = Geometry::assemble_transform(Vec3d::Zero(), Vec3d::Zero(), scale); Transform3d m = Geometry::assemble_transform(Vec3d::Zero(), Vec3d::Zero(), scale);