archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

No preemptive removal of muted and reroute nodes from compositor node

Browse Source 
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.
This commit is contained in:
Lukas Tönne
2014-07-15 11:00:59 +02:00
parent 2bdb872cfb
commit 2f03cccecd
1 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/nodes/composite/node_composite_tree.c
View File

@@ -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)