From cc978dc0c128f455145daf6d693ef0e571d22988 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 15 Jan 2014 10:03:56 +1100 Subject: Fix for minor precision glitch while zooming on clamped view2d --- source/blender/editors/interface/view2d.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'source/blender/editors/interface') diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index f74e7dc0a1d..e88e7e3e7af 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -404,23 +404,26 @@ static void ui_view2d_curRect_validate_resize(View2D *v2d, int resize, int mask_ * NOTE: in general, it is not expected that the lock-zoom will be used in conjunction with this */ else if (v2d->keepzoom & V2D_LIMITZOOM) { - float zoom, fac; /* check if excessive zoom on x-axis */ if ((v2d->keepzoom & V2D_LOCKZOOM_X) == 0) { - zoom = winx / width; - if ((zoom < v2d->minzoom) || (zoom > v2d->maxzoom)) { - fac = (zoom < v2d->minzoom) ? (zoom / v2d->minzoom) : (zoom / v2d->maxzoom); - width *= fac; + const float zoom = winx / width; + if (zoom < v2d->minzoom) { + width = winx / v2d->minzoom; + } + else if (zoom > v2d->maxzoom) { + width = winx / v2d->maxzoom; } } /* check if excessive zoom on y-axis */ if ((v2d->keepzoom & V2D_LOCKZOOM_Y) == 0) { - zoom = winy / height; - if ((zoom < v2d->minzoom) || (zoom > v2d->maxzoom)) { - fac = (zoom < v2d->minzoom) ? (zoom / v2d->minzoom) : (zoom / v2d->maxzoom); - height *= fac; + const float zoom = winy / height; + if (zoom < v2d->minzoom) { + height = winy / v2d->minzoom; + } + else if (zoom > v2d->maxzoom) { + height = winy / v2d->maxzoom; } } } -- cgit v1.2.3