[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52541] trunk/blender/source/blender/ editors/space_view3d/view3d_edit.c: continuous zoom was inverted from other zoom modes.

[Campbell Barton]

Revision: 52541
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52541
Author:   campbellbarton
Date:     2012-11-25 09:52:05 +0000 (Sun, 25 Nov 2012)
Log Message:
-----------
continuous zoom was inverted from other zoom modes.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/view3d_edit.c

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2012-11-25 09:25:24 UTC (rev 52540)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2012-11-25 09:52:05 UTC (rev 52541)
@@ -1653,7 +1653,7 @@
 }
 
 
-static void viewzoom_apply(ViewOpsData *vod, int x, int y, const short viewzoom, const short zoom_invert)
+static void viewzoom_apply(ViewOpsData *vod, const int x, const int y, const short viewzoom, const short zoom_invert)
 {
 	float zfac = 1.0;
 	short use_cam_zoom;
@@ -1674,10 +1674,10 @@
 		float fac;
 
 		if (U.uiflag & USER_ZOOM_HORIZ) {
-			fac = (float)(x - vod->origx);
+			fac = (float)(vod->origx - x);
 		}
 		else {
-			fac = (float)(y - vod->origy);
+			fac = (float)(vod->origy - y);
 		}
 
 		if (zoom_invert) {