Revision: 38263
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38263
Author: ton
Date: 2011-07-09 17:03:35 +0000 (Sat, 09 Jul 2011)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/node.c
Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c 2011-07-09
16:33:54 UTC (rev 38262)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2011-07-09
17:03:35 UTC (rev 38263)
@@ -2418,6 +2418,11 @@
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 @@
/* 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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
