diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-10-02 18:32:03 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-10-02 18:32:03 +0400 |
| commit | 9aa2bde26b833d173166390253fb088d15e909b2 (patch) | |
| tree | 8eef30c230da7f58d96b2600b0c898633d573530 /source/blender/blenkernel/intern/node.c | |
| parent | 11467a7873ed6b17ef09ab6e4754fb64b8d7bdf8 (diff) | |
Most likely fix for #23420: viewer node: loses viewer nodes forever.
Related to another bug fixed recently, both viewer + split viewer
could be set to output to the same image. That also could make node
tree localization/sync go wrong.
Diffstat (limited to 'source/blender/blenkernel/intern/node.c')
| -rw-r--r-- | source/blender/blenkernel/intern/node.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index ad3491b5dba..cb98c2282bc 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -1695,8 +1695,6 @@ static void ntreeSetOutput(bNodeTree *ntree) { bNode *node; - printf("\n"); - /* find the active outputs, might become tree type dependant handler */ for(node= ntree->nodes.first; node; node= node->next) { if(node->typeinfo->nclass==NODE_CLASS_OUTPUT) { @@ -1724,9 +1722,6 @@ static void ntreeSetOutput(bNodeTree *ntree) } if(output==0) node->flag |= NODE_DO_OUTPUT; - - if(node->flag & NODE_DO_OUTPUT) - printf("do output %s\n", node->name); } } @@ -2584,7 +2579,10 @@ bNodeTree *ntreeLocalize(bNodeTree *ntree) } /* end animdata uglyness */ - + + /* ensures only a single output node is enabled */ + ntreeSetOutput(ntree); + /* move over the compbufs */ /* right after ntreeCopyTree() oldsock pointers are valid */ for(node= ntree->nodes.first; node; node= node->next) { |