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

Follow-up of 9ddf2ba41c - Code cleanup

Browse source 
Fixed conflicts during rebase with master
This commit is contained in:
enricoturri1966 2021-10-26 11:55:11 +02:00
parent ad6dcf3f10
commit 9e0bb83041
2 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -596,12 +596,9 @@ 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()) {
if (wxGetApp().obj_manipul()->get_world_coordinates())
return !Geometry::is_rotation_ninety_degrees(get_volume(*m_list.begin())->get_instance_rotation());
else
return false;
}
else if (is_single_full_instance())
return wxGetApp().obj_manipul()->get_world_coordinates() ?
!Geometry::is_rotation_ninety_degrees(get_volume(*m_list.begin())->get_instance_rotation()) : false;
return true;
#else
@ -610,7 +607,7 @@ bool Selection::requires_uniform_scale() const
return true;
#endif // ENABLE_WORLD_COORDINATE
}
}
int Selection::get_object_idx() const
{