[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54042] trunk/blender/intern/cycles/render /graph.cpp: Fix #33905: cycles crash with bsdf node plugged twice into add shader.

[Brecht Van Lommel]

Revision: 54042
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54042
Author:   blendix
Date:     2013-01-23 13:13:20 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------
Fix #33905: cycles crash with bsdf node plugged twice into add shader.

Modified Paths:
--------------
    trunk/blender/intern/cycles/render/graph.cpp

Modified: trunk/blender/intern/cycles/render/graph.cpp
===================================================================
--- trunk/blender/intern/cycles/render/graph.cpp        2013-01-23 13:13:16 UTC 
(rev 54041)
+++ trunk/blender/intern/cycles/render/graph.cpp        2013-01-23 13:13:20 UTC 
(rev 54042)
@@ -708,7 +708,8 @@
                                value2_in->value.x = 1.0f;
 
                        weight_out = math_node->output("Value");
-                       disconnect(weight_in);
+                       if(weight_in->link)
+                               disconnect(weight_in);
                }
 
                /* connected to closure mix weight */

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs