diff options
Diffstat (limited to 'source/blender/nodes/composite/node_composite_tree.c')
-rw-r--r-- | source/blender/nodes/composite/node_composite_tree.c | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/source/blender/nodes/composite/node_composite_tree.c b/source/blender/nodes/composite/node_composite_tree.c index 6f4939ecbdd..5c58070be9d 100644 --- a/source/blender/nodes/composite/node_composite_tree.c +++ b/source/blender/nodes/composite/node_composite_tree.c @@ -183,11 +183,6 @@ static void local_merge(bNodeTree *localtree, bNodeTree *ntree) } } -static void update(bNodeTree *ntree) -{ - ntreeSetOutput(ntree); -} - bNodeTreeType ntreeType_Composite = { /* type */ NTREE_COMPOSIT, /* idname */ "NTCompositing Nodetree", @@ -200,7 +195,7 @@ bNodeTreeType ntreeType_Composite = { /* localize */ localize, /* local_sync */ local_sync, /* local_merge */ local_merge, - /* update */ update, + /* update */ NULL, /* update_node */ update_node }; @@ -721,9 +716,9 @@ void ntreeCompositTagRender(Scene *curscene) for(node= sce->nodetree->nodes.first; node; node= node->next) { if(node->id==(ID *)curscene || node->type==CMP_NODE_COMPOSITE) - nodeUpdate(sce->nodetree, node); + NodeTagChanged(sce->nodetree, node); else if(node->type==CMP_NODE_TEXTURE) /* uses scene sizex/sizey */ - nodeUpdate(sce->nodetree, node); + NodeTagChanged(sce->nodetree, node); } } } @@ -750,7 +745,7 @@ static int node_animation_properties(bNodeTree *ntree, bNode *node) for (index=0; index<len; index++) { if (rna_get_fcurve(&ptr, prop, index, NULL, &driven)) { - nodeUpdate(ntree, node); + NodeTagChanged(ntree, node); return 1; } } @@ -768,7 +763,7 @@ static int node_animation_properties(bNodeTree *ntree, bNode *node) for (index=0; index<len; index++) { if (rna_get_fcurve(&ptr, prop, index, NULL, &driven)) { - nodeUpdate(ntree, node); + NodeTagChanged(ntree, node); return 1; } } @@ -794,18 +789,18 @@ int ntreeCompositTagAnimated(bNodeTree *ntree) if(node->type==CMP_NODE_IMAGE) { Image *ima= (Image *)node->id; if(ima && ELEM(ima->source, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE)) { - nodeUpdate(ntree, node); + NodeTagChanged(ntree, node); tagged= 1; } } else if(node->type==CMP_NODE_TIME) { - nodeUpdate(ntree, node); + NodeTagChanged(ntree, node); tagged= 1; } /* here was tag render layer, but this is called after a render, so re-composites fail */ else if(node->type==NODE_GROUP) { if( ntreeCompositTagAnimated((bNodeTree *)node->id) ) { - nodeUpdate(ntree, node); + NodeTagChanged(ntree, node); } } } @@ -823,12 +818,12 @@ void ntreeCompositTagGenerators(bNodeTree *ntree) for(node= ntree->nodes.first; node; node= node->next) { if( ELEM(node->type, CMP_NODE_R_LAYERS, CMP_NODE_IMAGE)) - nodeUpdate(ntree, node); + NodeTagChanged(ntree, node); } } /* XXX after render animation system gets a refresh, this call allows composite to end clean */ -void ntreeCompositClearTags(bNodeTree *ntree) +void ntreeClearTags(bNodeTree *ntree) { bNode *node; @@ -837,6 +832,6 @@ void ntreeCompositClearTags(bNodeTree *ntree) for(node= ntree->nodes.first; node; node= node->next) { node->need_exec= 0; if(node->type==NODE_GROUP) - ntreeCompositClearTags((bNodeTree *)node->id); + ntreeClearTags((bNodeTree *)node->id); } } |