Revision: 39983
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39983
Author: nazgul
Date: 2011-09-06 18:15:34 +0000 (Tue, 06 Sep 2011)
Log Message:
-----------
Fixed potential crash in NodeTagIDChanged. Discovered after merge trunk
into tomato where there were no check for tree before calling this function.
Old design worked fine with this.
Mark some arguments as UNUSED.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_common.c
Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c 2011-09-06
17:48:06 UTC (rev 39982)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2011-09-06
18:15:34 UTC (rev 39983)
@@ -1534,13 +1534,15 @@
int NodeTagIDChanged(bNodeTree *ntree, ID *id)
{
- bNodeTreeType *ntreetype = ntreeGetType(ntree->type);
+ bNodeTreeType *ntreetype;
bNode *node;
int change = FALSE;
if(ELEM(NULL, id, ntree))
return change;
+ ntreetype = ntreeGetType(ntree->type);
+
if (ntreetype->update_node) {
for(node= ntree->nodes.first; node; node= node->next) {
if(node->id==id) {
Modified:
trunk/blender/source/blender/nodes/composite/nodes/node_composite_common.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_common.c
2011-09-06 17:48:06 UTC (rev 39982)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_common.c
2011-09-06 18:15:34 UTC (rev 39983)
@@ -135,7 +135,7 @@
return exec;
}
-static void group_freeexec(bNode *node, void *nodedata)
+static void group_freeexec(bNode *UNUSED(node), void *nodedata)
{
bNodeTreeExec *gexec= (bNodeTreeExec*)nodedata;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
