From c9830549eafc97f40b40de42fe43c38e512d3048 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 28 Dec 2011 19:42:08 +0000 Subject: [PATCH] Fix #29689, #29702: cycles render crash with node setups with non-cycles nodes, after group socket refactoring. --- intern/cycles/blender/blender_shader.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index 5c39a3f169d..f32d2d9a2ce 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -597,10 +597,14 @@ static void add_nodes(BL::BlendData b_data, ShaderGraph *graph, BL::ShaderNodeTr 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); + } } }