Revision: 31312
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31312
Author: blendix
Date: 2010-08-13 12:20:40 +0200 (Fri, 13 Aug 2010)
Log Message:
-----------
Fix #23111: file Output node not working when inside a group.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/node.c
Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c 2010-08-13
09:47:14 UTC (rev 31311)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2010-08-13
10:20:40 UTC (rev 31312)
@@ -1855,9 +1855,8 @@
/* for groups, only execute outputs for edited group */
if(node->typeinfo->nclass==NODE_CLASS_OUTPUT) {
- if(gnode->flag & NODE_GROUP_EDIT)
- if(node->flag & NODE_DO_OUTPUT)
- node->typeinfo->execfunc(data,
node, nsin, nsout);
+ if(node->type==CMP_NODE_OUTPUT_FILE ||
(gnode->flag & NODE_GROUP_EDIT))
+ node->typeinfo->execfunc(data, node,
nsin, nsout);
}
else
node->typeinfo->execfunc(data, node, nsin,
nsout);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs