[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56270] trunk/blender/source/blender/ editors/space_node: Fix #35008: compositing nodes viewer border (ctrl + B) not working correct inside node groups.

[Brecht Van Lommel]

Revision: 56270
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56270
Author:   blendix
Date:     2013-04-24 15:39:19 +0000 (Wed, 24 Apr 2013)
Log Message:
-----------
Fix #35008: compositing nodes viewer border (ctrl + B) not working correct inside node groups.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_node/drawnode.c
    trunk/blender/source/blender/editors/space_node/node_edit.c

Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c	2013-04-24 15:15:01 UTC (rev 56269)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c	2013-04-24 15:39:19 UTC (rev 56270)
@@ -2928,7 +2928,7 @@
 			/** @note draw selected info on backdrop */
 			if (snode->edittree) {
 				bNode *node = snode->edittree->nodes.first;
-				rctf *viewer_border = &snode->edittree->viewer_border;
+				rctf *viewer_border = &snode->nodetree->viewer_border;
 				while (node) {
 					if (node->flag & NODE_SELECT) {
 						if (node->typeinfo->uibackdropfunc) {
@@ -2938,7 +2938,7 @@
 					node = node->next;
 				}
 
-				if ((snode->edittree->flag & NTREE_VIEWER_BORDER) &&
+				if ((snode->nodetree->flag & NTREE_VIEWER_BORDER) &&
 				    viewer_border->xmin < viewer_border->xmax &&
 				    viewer_border->ymin < viewer_border->ymax)
 				{

Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_edit.c	2013-04-24 15:15:01 UTC (rev 56269)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c	2013-04-24 15:39:19 UTC (rev 56270)
@@ -2422,7 +2422,7 @@
 	if (ibuf) {
 		ARegion *ar = CTX_wm_region(C);
 		SpaceNode *snode = CTX_wm_space_node(C);
-		bNodeTree *btree = snode->edittree;
+		bNodeTree *btree = snode->nodetree;
 		rcti rect;
 		rctf rectf;