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

Tech ENABLE_WORLD_COORDINATE - Fixed constrained scaling of instances in local coordinates

Browse source 
Fixed conflicts during rebase with master
This commit is contained in:
enricoturri1966 2021-10-26 11:39:29 +02:00
parent 4aac01a221
commit ad6dcf3f10
4 changed files with 69 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -596,8 +596,12 @@ bool Selection::requires_uniform_scale() const
#if ENABLE_WORLD_COORDINATE
if (is_single_modifier() || is_single_volume())
return !Geometry::is_rotation_ninety_degrees(Geometry::Transformation(get_volume(*m_list.begin())->world_matrix()).get_rotation());
else if (is_single_full_instance() && wxGetApp().obj_manipul()->get_world_coordinates())
return !Geometry::is_rotation_ninety_degrees(get_volume(*m_list.begin())->get_instance_rotation());
else if (is_single_full_instance()) {
if (wxGetApp().obj_manipul()->get_world_coordinates())
return !Geometry::is_rotation_ninety_degrees(get_volume(*m_list.begin())->get_instance_rotation());
else
return false;
}
return true;
#else
@ -606,7 +610,7 @@ bool Selection::requires_uniform_scale() const
return true;
#endif // ENABLE_WORLD_COORDINATE
}
}
int Selection::get_object_idx() const
{