[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36825] trunk/blender/source/blender/ editors/space_view3d/view3d_edit.c: own recent commit broke zoom to mouseloc

[Campbell Barton]

Revision: 36825
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36825
Author:   campbellbarton
Date:     2011-05-23 02:59:29 +0000 (Mon, 23 May 2011)
Log Message:
-----------
own recent commit broke zoom to mouseloc

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	2011-05-23 02:53:30 UTC (rev 36824)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2011-05-23 02:59:29 UTC (rev 36825)
@@ -1112,22 +1112,14 @@
 		float tpos[3];
 		float mval_f[2];
 		float new_dist;
-		int vb[2], mouseloc[2];
 
-		mouseloc[0]= mx - ar->winrct.xmin;
-		mouseloc[1]= my - ar->winrct.ymin;
-
-		/* find the current window width and height */
-		vb[0] = ar->winx;
-		vb[1] = ar->winy;
-
 		negate_v3_v3(tpos, rv3d->ofs);
 
 		/* Project cursor position into 3D space */
 		initgrabz(rv3d, tpos[0], tpos[1], tpos[2]);
 
-		mval_f[0]= (mouseloc[0] - vb[0]) / 2.0f;
-		mval_f[1]= (mouseloc[1] - vb[1]) / 2.0f;
+		mval_f[0]= (float)(((mx - ar->winrct.xmin) * 2) - ar->winx) / 2.0f;
+		mval_f[1]= (float)(((my - ar->winrct.ymin) * 2) - ar->winy) / 2.0f;
 		ED_view3d_win_to_delta(ar, mval_f, dvec);
 
 		/* Calculate view target position for dolly */