diff options
| author | Ton Roosendaal <ton@blender.org> | 2011-07-09 21:03:35 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2011-07-09 21:03:35 +0400 |
| commit | de10ffab754d218e451078203cfa7e7d7da12eac (patch) | |
| tree | 96aa239073149c202635e3c09f3fa971c9372c9c | |
| parent | c50b5ee320d4d323b58ea038969d65583db72ad9 (diff) | |
Bugfix #27761
Material nodes: when no output node was active, it sets one.
Not common to happen anymore, only for deleting output nodes
without clicking on nodes.
| -rw-r--r-- | source/blender/blenkernel/intern/node.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 518ee3c341a..13469e0b58b 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -2418,6 +2418,11 @@ void ntreeBeginExecTree(bNodeTree *ntree) if(ntree->type==NTREE_COMPOSIT) composit_begin_exec(ntree, ntree->stack); + + /* ensures only a single output node is enabled, texnode allows multiple though */ + if(ntree->type!=NTREE_TEXTURE) + ntreeSetOutput(ntree); + } ntree->init |= NTREE_EXEC_INIT; @@ -2765,9 +2770,6 @@ void ntreeCompositExecTree(bNodeTree *ntree, RenderData *rd, int do_preview) /* fixed seed, for example noise texture */ BLI_srandom(rd->cfra); - /* ensures only a single output node is enabled */ - ntreeSetOutput(ntree); - /* sets need_exec tags in nodes */ curnode = totnode= setExecutableNodes(ntree, &thdata); |