Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2007-04-12 21:22:08 +0400
committerTon Roosendaal <ton@blender.org>2007-04-12 21:22:08 +0400
commit1b04ee899bf1e2176d01788c0377403b0eb54bea (patch)
tree70bfffdc8ee3eae2dc214feda8a8deeb6dd02563 /source
parent58c8a821e0b82dc83d8c1fb1e42d7d948d78d8e6 (diff)
Plumiferos report:
Compositor. New ESC feature did not work Ok for groups
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/depsgraph.c2
-rw-r--r--source/blender/blenkernel/intern/node.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index e31c7cc0348..a71ed731b07 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -462,7 +462,7 @@ static void build_dag_object(DagForest *dag, DagNode *scenenode, Object *ob, int
}
/* exception case: parent is duplivert */
if(ob->type==OB_MBALL && (ob->parent->transflag & OB_DUPLIVERTS)) {
- dag_add_relation(dag, node2, node,DAG_RL_DATA_DATA|DAG_RL_OB_OB);
+ dag_add_relation(dag, node2, node, DAG_RL_DATA_DATA|DAG_RL_OB_OB);
}
addtoroot = 0;
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index c86e4ff301b..b3eabe126bb 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -1623,6 +1623,10 @@ static void composit_begin_exec(bNodeTree *ntree, int is_group)
bNodeSocket *sock;
for(node= ntree->nodes.first; node; node= node->next) {
+
+ /* initialize needed for groups */
+ node->exec= 0;
+
if(is_group==0) {
for(sock= node->outputs.first; sock; sock= sock->next) {
bNodeStack *ns= ntree->stack[0] + sock->stack_index;