[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33535] trunk/blender/source/blender/ editors/space_node/node_draw.c: Bugfix #24163a: Unable to animate INSIDE a group node in the compositor

Joshua Leung aligorith at gmail.com
Tue Dec 7 12:03:53 CET 2010


Revision: 33535
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33535
Author:   aligorith
Date:     2010-12-07 12:03:53 +0100 (Tue, 07 Dec 2010)

Log Message:
-----------
Bugfix #24163a: Unable to animate INSIDE a group node in the compositor
(This commit doesn't fix the original bug reported in the report, but does fix one that was discovered while investigating that one) 

Trying to insert keyframes for nodes within group nodes was failing. 

This was caused by the ID-block for those UI widgets being set to the Node Editor's current ID-block (i.e. NodeTree) vs the NodeTree that those nodes lived in. The net result was that the paths couldn't be resolved, as the paths obtained for those widgets could only work up to the group's nodetree.

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-12-07 10:15:09 UTC (rev 33534)
+++ trunk/blender/source/blender/editors/space_node/node_draw.c	2010-12-07 11:03:53 UTC (rev 33535)
@@ -630,7 +630,7 @@
 	
 }
 
-static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bNode *node)
+static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bNodeTree *ntree, bNode *node)
 {
 	bNodeSocket *sock;
 	uiBut *bt;
@@ -639,7 +639,6 @@
 	int /*ofs,*/ color_id= node_get_colorid(node);
 	char showname[128]; /* 128 used below */
 	View2D *v2d = &ar->v2d;
-	bNodeTree *ntree = snode->nodetree;
 	PointerRNA ptr;
 	
 	/* hurmf... another candidate for callback, have to see how this works first */
@@ -943,7 +942,7 @@
 			else if(node->flag & NODE_HIDDEN)
 				node_draw_hidden(C, ar, snode, node);
 			else
-				node_draw_basis(C, ar, snode, node);
+				node_draw_basis(C, ar, snode, ntree, node);
 		}
 	}
 	
@@ -954,7 +953,7 @@
 			else if(node->flag & NODE_HIDDEN)
 				node_draw_hidden(C, ar, snode, node);
 			else
-				node_draw_basis(C, ar, snode, node);
+				node_draw_basis(C, ar, snode, ntree, node);
 		}
 	}	
 }





More information about the Bf-blender-cvs mailing list