[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51209] trunk/blender/source/blender/ editors/interface/view2d_ops.c: OSX zoom pinch was using inverted direction

[Sergey Sharybin]

Revision: 51209
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51209
Author:   nazgul
Date:     2012-10-09 09:38:05 +0000 (Tue, 09 Oct 2012)
Log Message:
-----------
OSX zoom pinch was using inverted direction

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-09 09:14:37 UTC (rev 51208)
+++ trunk/blender/source/blender/editors/interface/view2d_ops.c	2012-10-09 09:38:05 UTC (rev 51209)
@@ -941,10 +941,15 @@
 		/* As we have only 1D information (magnify value), feed both axes
 		 * with magnify information that is stored in x axis 
 		 */
-		fac = 0.01f * (event->x - event->prevx);
+		fac = 0.01f * (event->prevx - event->x);
 		dx = fac * BLI_rctf_size_x(&v2d->cur) / 10.0f;
 		dy = fac * BLI_rctf_size_y(&v2d->cur) / 10.0f;
 
+		if (U.uiflag & USER_ZOOM_INVERT) {
+			dx *= -1;
+			dy *= -1;
+		}
+
 		RNA_float_set(op->ptr, "deltax", dx);
 		RNA_float_set(op->ptr, "deltay", dy);