[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18846] branches/blender2.5/blender/source /blender/editors/interface/view2d_ops.c: View2D bugfix:

Joshua Leung aligorith at gmail.com
Sat Feb 7 11:39:23 CET 2009


Revision: 18846
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18846
Author:   aligorith
Date:     2009-02-07 11:39:20 +0100 (Sat, 07 Feb 2009)

Log Message:
-----------
View2D bugfix:

The previous fix for zooming only worked as lucky coincident. It was the flag that was wrong, not the var.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c

Modified: branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c	2009-02-07 10:00:46 UTC (rev 18845)
+++ branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c	2009-02-07 10:39:20 UTC (rev 18846)
@@ -487,12 +487,12 @@
 	dx= (v2d->cur.xmax - v2d->cur.xmin) * (float)RNA_float_get(op->ptr, "zoomfacx");
 	dy= (v2d->cur.ymax - v2d->cur.ymin) * (float)RNA_float_get(op->ptr, "zoomfacy");
 	
-	/* only move view on an axis if change is allowed */
-	if ((v2d->keepofs & V2D_LOCKOFS_X)==0) {
+	/* only resize view on an axis if change is allowed */
+	if ((v2d->keepzoom & V2D_LOCKZOOM_X)==0) {
 		v2d->cur.xmin += dx;
 		v2d->cur.xmax -= dx;
 	}
-	if ((v2d->keepofs & V2D_LOCKOFS_Y)==0) {
+	if ((v2d->keepzoom & V2D_LOCKZOOM_Y)==0) {
 		v2d->cur.ymin += dy;
 		v2d->cur.ymax -= dy;
 	}





More information about the Bf-blender-cvs mailing list