Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes

This commit is contained in:
Enrico Turri 2019-01-29 12:09:01 +01:00
commit 4776ad786f
3 changed files with 10 additions and 7 deletions

View file

@ -5920,6 +5920,9 @@ void GLCanvas3D::set_camera_zoom(float zoom)
if (zoom_min > 0.0f)
zoom = std::max(zoom, zoom_min * 0.7f);
// Don't allow to zoom too close to the scene.
zoom = std::min(zoom, 100.0f);
m_camera.zoom = zoom;
viewport_changed();
_refresh_if_shown_on_screen();