[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54635] trunk/blender/source/blender/ editors/interface/view2d_ops.c: Bug fix #34292

[Ton Roosendaal]

Revision: 54635
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54635
Author:   ton
Date:     2013-02-18 15:14:34 +0000 (Mon, 18 Feb 2013)
Log Message:
-----------
Bug fix #34292

CTRL + MMB zoom in 2d editors now depends on 'max zoom' level. This makes
zooms in UI (very limited) go smoother, but for fcurve or timeline it's same.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/view2d_ops.c

Modified: trunk/blender/source/blender/editors/interface/view2d_ops.c
===================================================================
--- trunk/blender/source/blender/editors/interface/view2d_ops.c	2013-02-18 15:08:27 UTC (rev 54634)
+++ trunk/blender/source/blender/editors/interface/view2d_ops.c	2013-02-18 15:14:34 UTC (rev 54635)
@@ -1034,14 +1034,17 @@
 		}
 		else {
 			/* 'continuous' or 'dolly' */
-			float fac;
+			float fac, zoomfac = 0.001f * v2d->maxzoom;
 			
+			/* some view2d's (graph) don't have min/max zoom, or extreme ones */
+			CLAMP (zoomfac, 0.001f, 0.01f);
+			
 			/* x-axis transform */
-			fac = 0.01f * (event->x - vzd->lastx);
+			fac = zoomfac * (event->x - vzd->lastx);
 			dx = fac * BLI_rctf_size_x(&v2d->cur);
 			
 			/* y-axis transform */
-			fac = 0.01f * (event->y - vzd->lasty);
+			fac = zoomfac * (event->y - vzd->lasty);
 			dy = fac * BLI_rctf_size_y(&v2d->cur);
 			
 		}