[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51191] trunk/blender/source/blender/ editors/interface/view2d_ops.c: Correction to zoom-t-mouse formula which was broken since view2d drag zoom refactoring

[Sergey Sharybin]

Revision: 51191
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51191
Author:   nazgul
Date:     2012-10-08 17:41:27 +0000 (Mon, 08 Oct 2012)
Log Message:
-----------
Correction to zoom-t-mouse formula which was broken since view2d drag zoom refactoring

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	2012-10-08 14:40:15 UTC (rev 51190)
+++ trunk/blender/source/blender/editors/interface/view2d_ops.c	2012-10-08 17:41:27 UTC (rev 51191)
@@ -849,8 +849,8 @@
 				float mval_faci = 1.0f - mval_fac;
 				float ofs = (mval_fac * dx) - (mval_faci * dx);
 				
-				v2d->cur.xmin += ofs - dx;
-				v2d->cur.xmax += ofs + dx;
+				v2d->cur.xmin -= ofs + dx;
+				v2d->cur.xmax -= ofs - dx;
 			}
 			else {
 				v2d->cur.xmin -= dx;
@@ -868,8 +868,8 @@
 				float mval_faci = 1.0f - mval_fac;
 				float ofs = (mval_fac * dy) - (mval_faci * dy);
 				
-				v2d->cur.ymin += ofs - dy;
-				v2d->cur.ymax += ofs + dy;
+				v2d->cur.ymin -= ofs + dy;
+				v2d->cur.ymax -= ofs - dy;
 			}
 			else {
 				v2d->cur.ymin -= dy;
@@ -1045,13 +1045,13 @@
 		
 		/* set transform amount, and add current deltas to stored total delta (for redo) */
 		if (U.uiflag & USER_ZOOM_INVERT) {
-			RNA_float_set(op->ptr, "deltax", -dx);
-			RNA_float_set(op->ptr, "deltay", -dy);
+			dx *= -1;
+			dy *= -1;
 		}
-		else {
-			RNA_float_set(op->ptr, "deltax", dx);
-			RNA_float_set(op->ptr, "deltay", dy);
-		}
+
+		RNA_float_set(op->ptr, "deltax", dx);
+		RNA_float_set(op->ptr, "deltay", dy);
+
 		vzd->dx += dx;
 		vzd->dy += dy;