GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-17 13:45:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed conflicts after merge with dev branch

Browse Source
This commit is contained in:
enricoturri1966 2022-01-27 12:03:46 +01:00
commit 983a4de60d
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -5022,6 +5022,7 @@ BoundingBoxf3 GLCanvas3D::_max_bounding_box(bool include_gizmos, bool include_be
bb.merge(m_gcode_viewer.get_max_bounding_box()); bb.merge(m_gcode_viewer.get_max_bounding_box());
// clamp max bb size with respect to bed bb size // clamp max bb size with respect to bed bb size
if (!m_picking_enabled) {
static const double max_scale_factor = 1.5; static const double max_scale_factor = 1.5;
const Vec3d bb_size = bb.size(); const Vec3d bb_size = bb.size();
const Vec3d bed_bb_size = bed_bb.size(); const Vec3d bed_bb_size = bed_bb.size();
@ -5032,6 +5033,7 @@ BoundingBoxf3 GLCanvas3D::_max_bounding_box(bool include_gizmos, bool include_be
const Vec3d extend_by = max_scale_factor * bed_bb_size; const Vec3d extend_by = max_scale_factor * bed_bb_size;
bb = BoundingBoxf3(bed_bb_center - extend_by, bed_bb_center + extend_by); bb = BoundingBoxf3(bed_bb_center - extend_by, bed_bb_center + extend_by);
} }
}
return bb; return bb;
} }