[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27823] trunk/blender/source/blender/ editors/space_node/node_draw.c: Fix [#21706] edit field in nodegroup which overlaps a node, edits the field of the overlapped node

[Matt Ebb]

Revision: 27823
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27823
Author:   broken
Date:     2010-03-29 09:15:12 +0200 (Mon, 29 Mar 2010)

Log Message:
-----------
Fix [#21706] edit field in nodegroup which overlaps a node, edits the field of the overlapped node

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

Modified: trunk/blender/source/blender/editors/space_node/node_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_draw.c	2010-03-29 07:07:20 UTC (rev 27822)
+++ trunk/blender/source/blender/editors/space_node/node_draw.c	2010-03-29 07:15:12 UTC (rev 27823)
@@ -394,9 +394,6 @@
 	rctf *rect= &gnode->totr;
 	int counter;
 	
-	/* init ui blocks for sub-nodetrees */
-	node_uiblocks_init(C, ngroup);
-	
 	/* center them, is a bit of abuse of locx and locy though */
 	for(node= ngroup->nodes.first; node; node= node->next) {
 		node->locx+= gnode->locx;
@@ -1099,8 +1096,16 @@
 	if(snode->nodetree) {
 		bNode *node;
 		
+		/* init ui blocks for opened node group trees first 
+		 * so they're in the correct depth stack order */
+		for(node= snode->nodetree->nodes.first; node; node= node->next) {
+			if(node->flag & NODE_GROUP_EDIT)
+				node_uiblocks_init(C, (bNodeTree *)node->id);
+		}
+
 		node_uiblocks_init(C, snode->nodetree);
 		
+		
 		/* for now, we set drawing coordinates on each redraw */
 		for(node= snode->nodetree->nodes.first; node; node= node->next) {
 			if(node->flag & NODE_GROUP_EDIT)