Plumiferos report:
authorTon Roosendaal <ton@blender.org>
Thu, 12 Apr 2007 17:22:08 +0000 (17:22 +0000)
committerTon Roosendaal <ton@blender.org>
Thu, 12 Apr 2007 17:22:08 +0000 (17:22 +0000)
Compositor. New ESC feature did not work Ok for groups

source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/node.c

index e31c7cc0348a34d5aef6d19b513c6140c5790f7f..a71ed731b078961f9db1970f3aa0ca2e2a91f93e 100644 (file)
@@ -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;
index c86e4ff301b50e27e4e73cc445915b10d6a07446..b3eabe126bb6a919843898ee24cb1e021be110f4 100644 (file)
@@ -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;