diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-07-15 13:00:59 +0400 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2014-07-15 13:03:07 +0400 |
commit | 2f03cccecd1eaa5c95daa7a75b3d0c57e7d0e038 (patch) | |
tree | 22a7c37e5d12ea0fd9a0fd8f87ecf6c2012ae7e7 /source/blender | |
parent | 2bdb872cfb90feae214088954d243820e4992c3b (diff) |
No preemptive removal of muted and reroute nodes from compositor node
trees for localization (previews and viewer evaluation).
This is handled entirely by the compositor already. Doing this during
localization is redundant and risks divergent behavior.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/nodes/composite/node_composite_tree.c | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/source/blender/nodes/composite/node_composite_tree.c b/source/blender/nodes/composite/node_composite_tree.c index cd69cf4982d..6d5b85da569 100644 --- a/source/blender/nodes/composite/node_composite_tree.c +++ b/source/blender/nodes/composite/node_composite_tree.c @@ -104,9 +104,9 @@ static void free_cache(bNodeTree *ntree) } /* local tree then owns all compbufs */ -static void localize(bNodeTree *localtree, bNodeTree *ntree) +static void localize(bNodeTree *UNUSED(localtree), bNodeTree *ntree) { - bNode *node, *node_next; + bNode *node; bNodeSocket *sock; for (node = ntree->nodes.first; node; node = node->next) { @@ -132,26 +132,6 @@ static void localize(bNodeTree *localtree, bNodeTree *ntree) sock->new_sock->new_sock = sock; } } - - /* replace muted nodes and reroute nodes by internal links */ - for (node = localtree->nodes.first; node; node = node_next) { - node_next = node->next; - - if (node->flag & NODE_MUTED || node->type == NODE_REROUTE) { - /* make sure the update tag isn't lost when removing the muted node. - * propagate this to all downstream nodes. - */ - if (node->need_exec) { - bNodeLink *link; - for (link = localtree->links.first; link; link = link->next) - if (link->fromnode == node && link->tonode) - link->tonode->need_exec = 1; - } - - nodeInternalRelink(localtree, node); - nodeFreeNode(localtree, node); - } - } } static void local_sync(bNodeTree *localtree, bNodeTree *ntree) |