From dc60fdd671a8fc2ca54587772e20ab6412f654b7 Mon Sep 17 00:00:00 2001 From: Anthony Edlin Date: Fri, 14 Oct 2016 00:54:05 +0200 Subject: 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 --- source/blender/editors/space_image/image_ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/editors/space_image/image_ops.c') 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; -- cgit v1.2.3