From fd05d7bbcb3d513ae5521dce5f98b463ebf25130 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 19 Apr 2019 11:53:00 +0200 Subject: Cleanup: Remove unneeded compositor update function Similar to previous commit. Compositing with animation on socket values and image sequences still works fine. --- .../blender/nodes/composite/node_composite_tree.c | 79 ---------------------- 1 file changed, 79 deletions(-) (limited to 'source/blender/nodes') diff --git a/source/blender/nodes/composite/node_composite_tree.c b/source/blender/nodes/composite/node_composite_tree.c index 53fdde5baf2..d3c608fc747 100644 --- a/source/blender/nodes/composite/node_composite_tree.c +++ b/source/blender/nodes/composite/node_composite_tree.c @@ -299,85 +299,6 @@ void ntreeCompositTagRender(Scene *curscene) } } -static int node_animation_properties(bNodeTree *ntree, bNode *node) -{ - bNodeSocket *sock; - const ListBase *lb; - Link *link; - PointerRNA ptr; - PropertyRNA *prop; - - /* check to see if any of the node's properties have fcurves */ - RNA_pointer_create((ID *)ntree, &RNA_Node, node, &ptr); - lb = RNA_struct_type_properties(ptr.type); - - for (link = lb->first; link; link = link->next) { - prop = (PropertyRNA *)link; - - if (RNA_property_animated(&ptr, prop)) { - nodeUpdate(ntree, node); - return 1; - } - } - - /* now check node sockets */ - for (sock = node->inputs.first; sock; sock = sock->next) { - RNA_pointer_create((ID *)ntree, &RNA_NodeSocket, sock, &ptr); - prop = RNA_struct_find_property(&ptr, "default_value"); - - if (RNA_property_animated(&ptr, prop)) { - nodeUpdate(ntree, node); - return 1; - } - } - - return 0; -} - -/* tags nodes that have animation capabilities */ -int ntreeCompositTagAnimated(bNodeTree *ntree) -{ - bNode *node; - int tagged = 0; - - if (ntree == NULL) - return 0; - - for (node = ntree->nodes.first; node; node = node->next) { - - tagged = node_animation_properties(ntree, node); - - /* otherwise always tag these node types */ - if (node->type == CMP_NODE_IMAGE) { - Image *ima = (Image *)node->id; - if (ima && BKE_image_is_animated(ima)) { - nodeUpdate(ntree, node); - tagged = 1; - } - } - else if (node->type == CMP_NODE_TIME) { - nodeUpdate(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); - } - } - else if (ELEM(node->type, CMP_NODE_MOVIECLIP, CMP_NODE_TRANSFORM)) { - nodeUpdate(ntree, node); - tagged = 1; - } - else if (node->type == CMP_NODE_MASK) { - nodeUpdate(ntree, node); - tagged = 1; - } - } - - return tagged; -} - /* called from image window preview */ void ntreeCompositTagGenerators(bNodeTree *ntree) { -- cgit v1.2.3