[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42020] trunk/blender/source/blender/nodes /composite/nodes/node_composite_common.c: Fix for crasher when node group tree datablocks are missing.
Lukas Toenne
lukas.toenne at googlemail.com
Sun Nov 20 17:57:51 CET 2011
Revision: 42020
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42020
Author: lukastoenne
Date: 2011-11-20 16:57:50 +0000 (Sun, 20 Nov 2011)
Log Message:
-----------
Fix for crasher when node group tree datablocks are missing.
Modified Paths:
--------------
trunk/blender/source/blender/nodes/composite/nodes/node_composite_common.c
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_common.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_common.c 2011-11-20 16:38:23 UTC (rev 42019)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_common.c 2011-11-20 16:57:50 UTC (rev 42020)
@@ -119,6 +119,9 @@
bNodeSocket *sock;
bNodeStack *ns;
+ if (!ngroup)
+ return NULL;
+
/* initialize the internal node tree execution */
exec = ntreeCompositBeginExecTree(ngroup, 0);
@@ -137,7 +140,8 @@
{
bNodeTreeExec *gexec= (bNodeTreeExec*)nodedata;
- ntreeCompositEndExecTree(gexec, 0);
+ if (gexec)
+ ntreeCompositEndExecTree(gexec, 0);
}
/* Copy inputs to the internal stack.
@@ -191,6 +195,9 @@
{
bNodeTreeExec *exec= (bNodeTreeExec*)nodedata;
+ if (!exec)
+ return;
+
/* XXX same behavior as trunk: all nodes inside group are executed.
* it's stupid, but just makes it work. compo redesign will do this better.
*/
More information about the Bf-blender-cvs
mailing list