diff options
| author | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-03-06 15:34:57 +0400 |
|---|---|---|
| committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-03-06 15:34:57 +0400 |
| commit | 92322b57d4652275e328b8ee94d631e72a82ed0e (patch) | |
| tree | fe6b4018bbf339855187175c5f3d7cf5049a5a8d /intern | |
| parent | 2b9551a4e4306b7ec1501da2510a8a35895eb8af (diff) | |
Fix for 30439, Cycles node group conversion wasn't checking node->id pointer (group node without internal node tree). This is a somewhat unusual case (UI buttons don't allow unlinking group tree), but not entirely forbidden.
Also fixed similar issue in node_templates.c where the group tree is used to generate a button name.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index 415a043cf78..45076122467 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -517,6 +517,9 @@ static void add_nodes(BL::BlendData b_data, ShaderGraph *graph, BL::ShaderNodeTr /* add proxy converter nodes for inputs and outputs */ BL::NodeGroup b_gnode(*b_node); BL::ShaderNodeTree b_group_ntree(b_gnode.node_tree()); + if (!b_group_ntree) + continue; + BL::Node::inputs_iterator b_input; BL::Node::outputs_iterator b_output; |