3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-31 04:31:15 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'master' of https://github.com/Prusa3d/Slic3r

Browse source
This commit is contained in:
bubnikv 2018-12-18 12:05:26 +01:00
commit 6359bda0c0
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -390,12 +390,20 @@ void ObjectManipulation::change_scale_value(const Vec3d& scale)
if (needs_uniform_scale) if (needs_uniform_scale)
{ {
double min = scaling_factor.minCoeff(); Vec3d abs_scale_diff = (scale - cache_scale).cwiseAbs();
double max = scaling_factor.maxCoeff(); double max_diff = abs_scale_diff(X);
if (min != 100.0) Axis max_diff_axis = X;
scaling_factor = Vec3d(min, min, min); if (max_diff < abs_scale_diff(Y))
else if (max != 100.0) {
scaling_factor = Vec3d(max, max, max); max_diff = abs_scale_diff(Y);
max_diff_axis = Y;
}
if (max_diff < abs_scale_diff(Z))
{
max_diff = abs_scale_diff(Z);
max_diff_axis = Z;
}
scaling_factor = Vec3d(scale(max_diff_axis), scale(max_diff_axis), scale(max_diff_axis));
} }
scaling_factor *= 0.01; scaling_factor *= 0.01;