3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-22 14:13:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Follow-up of 1d4e7f5577 -> More robust fix

Browse source
This commit is contained in:
enricoturri1966 2021-07-29 12:14:51 +02:00
parent bfad83e796
commit 701286615f
1 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -842,15 +842,8 @@ 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) {
if (volume.is_modifier) { if (volume.is_modifier)
int object_idx = volume.object_idx(); is_any_volume_sinking = true;
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 else
is_any_volume_sinking |= std::find(m_cache.sinking_volumes.begin(), m_cache.sinking_volumes.end(), i) != m_cache.sinking_volumes.end(); is_any_volume_sinking |= std::find(m_cache.sinking_volumes.begin(), m_cache.sinking_volumes.end(), i) != m_cache.sinking_volumes.end();
} }
@ -2134,7 +2127,7 @@ void Selection::ensure_on_bed()
for (GLVolume* volume : *m_volumes) { for (GLVolume* volume : *m_volumes) {
if (!volume->is_wipe_tower && !volume->is_modifier) { if (!volume->is_wipe_tower && !volume->is_modifier) {
double min_z = volume->transformed_convex_hull_bounding_box().min(2); const double min_z = volume->transformed_convex_hull_bounding_box().min.z();
std::pair<int, int> instance = std::make_pair(volume->object_idx(), volume->instance_idx()); std::pair<int, int> instance = std::make_pair(volume->object_idx(), volume->instance_idx());
InstancesToZMap::iterator it = instances_min_z.find(instance); InstancesToZMap::iterator it = instances_min_z.find(instance);
if (it == instances_min_z.end()) if (it == instances_min_z.end())