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

Tech ENABLE_WORLD_COORDINATE - Fixed unconstrained scaling in world coordinates for volumes

Browse source 
Fixed conflicts during rebase with master
This commit is contained in:
enricoturri1966 2021-10-21 12:16:59 +02:00
parent 9074407196
commit 0eaa4c5dea
3 changed files with 24 additions and 6 deletions

6
src/slic3r/GUI/GUI_ObjectManipulation.cpp
View file

@ -1014,12 +1014,18 @@ void ObjectManipulation::do_scale(int axis, const Vec3d &scale) const
Selection& selection = wxGetApp().plater()->canvas3D()->get_selection();
Vec3d scaling_factor = scale;
#if ENABLE_WORLD_COORDINATE
TransformationType transformation_type;
if (!m_world_coordinates)
transformation_type.set_local();
#else
TransformationType transformation_type(TransformationType::World_Relative_Joint);
if (selection.is_single_full_instance()) {
transformation_type.set_absolute();
if (! m_world_coordinates)
transformation_type.set_local();
}
#endif // ENABLE_WORLD_COORDINATE
if (m_uniform_scale || selection.requires_uniform_scale())
scaling_factor = scale(axis) * Vec3d::Ones();