[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47233] trunk/blender/intern/cycles/render /graph.cpp: Fix #31645, mix node results in crash upon render.

[Lukas Toenne]

Revision: 47233
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47233
Author:   lukastoenne
Date:     2012-05-30 15:47:12 +0000 (Wed, 30 May 2012)
Log Message:
-----------
Fix #31645, mix node results in crash upon render. This happens when unused mix nodes are removed from the cycles graph. In case the inputs are both unconnected it still tried to reconnect them.

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

Modified: trunk/blender/intern/cycles/render/graph.cpp
===================================================================
--- trunk/blender/intern/cycles/render/graph.cpp	2012-05-30 15:23:17 UTC (rev 47232)
+++ trunk/blender/intern/cycles/render/graph.cpp	2012-05-30 15:47:12 UTC (rev 47233)
@@ -340,7 +340,8 @@
 
 				foreach(ShaderInput *input, inputs) {
 					disconnect(input);
-					connect(output, input);
+					if (output)
+						connect(output, input);
 				}
 			}
 		}