[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28863] branches/render25/source/blender: fixed node editor zooming the wrong direction

[Joseph Eagar]

Revision: 28863
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28863
Author:   joeedh
Date:     2010-05-19 18:19:17 +0200 (Wed, 19 May 2010)

Log Message:
-----------
fixed node editor zooming the wrong direction

Modified Paths:
--------------
    branches/render25/source/blender/editors/interface/view2d_ops.c
    branches/render25/source/blender/editors/space_node/node_draw.c
    branches/render25/source/blender/editors/space_node/space_node.c
    branches/render25/source/blender/makesdna/DNA_group_types.h
    branches/render25/source/blender/makesdna/DNA_view2d_types.h

Modified: branches/render25/source/blender/editors/interface/view2d_ops.c
===================================================================
--- branches/render25/source/blender/editors/interface/view2d_ops.c	2010-05-19 15:53:07 UTC (rev 28862)
+++ branches/render25/source/blender/editors/interface/view2d_ops.c	2010-05-19 16:19:17 UTC (rev 28863)
@@ -783,6 +783,10 @@
 	dx= RNA_float_get(op->ptr, "deltax");
 	dy= RNA_float_get(op->ptr, "deltay");
 	
+	if (v2d->keepzoom & V2D_INVERTZOOM) {
+		dx  = -dx; dy = -dy;
+	}
+
 	/* only move view on an axis if change is allowed */
 	if ((v2d->keepzoom & V2D_LOCKZOOM_X)==0) {
 		if (v2d->keepofs & V2D_LOCKOFS_X) {

Modified: branches/render25/source/blender/editors/space_node/node_draw.c
===================================================================
--- branches/render25/source/blender/editors/space_node/node_draw.c	2010-05-19 15:53:07 UTC (rev 28862)
+++ branches/render25/source/blender/editors/space_node/node_draw.c	2010-05-19 16:19:17 UTC (rev 28863)
@@ -1068,7 +1068,10 @@
 	glClear(GL_COLOR_BUFFER_BIT);
 
 	UI_view2d_view_ortho(C, v2d);
-	
+
+	/*this is set here to avoid writing a version patch*/
+	v2d->keepzoom |= V2D_INVERTZOOM;
+
 	//uiFreeBlocksWin(&sa->uiblocks, sa->win);
 
 	/* only set once */

Modified: branches/render25/source/blender/editors/space_node/space_node.c
===================================================================
--- branches/render25/source/blender/editors/space_node/space_node.c	2010-05-19 15:53:07 UTC (rev 28862)
+++ branches/render25/source/blender/editors/space_node/space_node.c	2010-05-19 16:19:17 UTC (rev 28863)
@@ -140,7 +140,7 @@
 	ar->v2d.maxzoom= 2.31f;
 	
 	ar->v2d.scroll= (V2D_SCROLL_RIGHT|V2D_SCROLL_BOTTOM);
-	ar->v2d.keepzoom= V2D_LIMITZOOM|V2D_KEEPASPECT;
+	ar->v2d.keepzoom= V2D_LIMITZOOM|V2D_KEEPASPECT|V2D_INVERTZOOM;
 	ar->v2d.keeptot= 0;
 	
 	return (SpaceLink *)snode;

Modified: branches/render25/source/blender/makesdna/DNA_group_types.h
===================================================================
--- branches/render25/source/blender/makesdna/DNA_group_types.h	2010-05-19 15:53:07 UTC (rev 28862)
+++ branches/render25/source/blender/makesdna/DNA_group_types.h	2010-05-19 16:19:17 UTC (rev 28863)
@@ -41,7 +41,7 @@
 	struct Object *ob;
 	void *lampren;		/* used while render */
 	int recalc;			/* copy of ob->recalc, used to set animated groups OK */
-	int pad;
+	int templay;
 } GroupObject;
 
 

Modified: branches/render25/source/blender/makesdna/DNA_view2d_types.h
===================================================================
--- branches/render25/source/blender/makesdna/DNA_view2d_types.h	2010-05-19 15:53:07 UTC (rev 28862)
+++ branches/render25/source/blender/makesdna/DNA_view2d_types.h	2010-05-19 16:19:17 UTC (rev 28863)
@@ -77,6 +77,8 @@
 #define V2D_LOCKZOOM_X		0x0100
 	/* zooming on y-axis is not allowed */
 #define V2D_LOCKZOOM_Y		0x0200
+	/* invert zoom handling */
+#define V2D_INVERTZOOM		0x0400
 
 /* view panning restrictions, per axis (v2d->keepofs) */
 	/* panning on x-axis is not allowed */