[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42946] trunk/blender/intern/cycles/ blender/blender_shader.cpp: Fix #29689, #29702: cycles render crash with node setups with non-cycles nodes,

[Brecht Van Lommel]

Revision: 42946
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42946
Author:   blendix
Date:     2011-12-28 19:42:08 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
Fix #29689, #29702: cycles render crash with node setups with non-cycles nodes,
after group socket refactoring.

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_shader.cpp

Modified: trunk/blender/intern/cycles/blender/blender_shader.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_shader.cpp	2011-12-28 18:31:32 UTC (rev 42945)
+++ trunk/blender/intern/cycles/blender/blender_shader.cpp	2011-12-28 19:42:08 UTC (rev 42946)
@@ -597,10 +597,14 @@
 		else
 			to_pair = sockets_map[b_to_sock.ptr.data];
 
-		ShaderOutput *output = from_pair.first->output(from_pair.second.c_str());
-		ShaderInput *input = to_pair.first->input(to_pair.second.c_str());
+		/* either node may be NULL when the node was not exported, typically
+		   because the node type is not supported */
+		if(from_pair.first && to_pair.first) {
+			ShaderOutput *output = from_pair.first->output(from_pair.second.c_str());
+			ShaderInput *input = to_pair.first->input(to_pair.second.c_str());
 
-		graph->connect(output, input);
+			graph->connect(output, input);
+		}
 	}
 }