diff options
| author | Anthony Edlin <akrashe@gmail.com> | 2016-10-14 01:54:05 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2016-10-14 02:07:18 +0300 |
| commit | dc60fdd671a8fc2ca54587772e20ab6412f654b7 (patch) | |
| tree | 335356ae162b82045d9a9772fadad6107b202175 /source/blender/editors/space_image/image_ops.c | |
| parent | 625b504b23beb11e8a02408e7474e38fa525e8ee (diff) | |
Fix T49646: Switching from large to small image can get stuck zoom at max zoom distance.
Allow for zooming in at max zoom distance.
Reviewed By: Severin
Differential Revision: https://developer.blender.org/D2291
Diffstat (limited to 'source/blender/editors/space_image/image_ops.c')
| -rw-r--r-- | source/blender/editors/space_image/image_ops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index b4dd5c4a87f..6ca738b0e11 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -122,7 +122,7 @@ static void sima_zoom_set(SpaceImage *sima, ARegion *ar, float zoom, const float width *= sima->zoom; height *= sima->zoom; - if ((width < 4) && (height < 4)) + if ((width < 4) && (height < 4) && sima->zoom < oldzoom) sima->zoom = oldzoom; else if (BLI_rcti_size_x(&ar->winrct) <= sima->zoom) sima->zoom = oldzoom; |