diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-23 21:16:11 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-23 21:16:11 +0300 |
| commit | 4f8bffa7bfe46192b43c75d864e2117369cbffdd (patch) | |
| tree | 3e869e57151f4d487106d59bba1f2282a9578a44 /source/blender/nodes | |
| parent | b79b8478ee3bb1b115c5d6b8bdb0cc74d5169955 (diff) | |
| parent | debd9f6ea1286533d4d5c9262fa6724c862fe35e (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/shader/node_shader_tree.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/nodes/shader/node_shader_tree.c b/source/blender/nodes/shader/node_shader_tree.c index dc48aa324b2..bd22a2be647 100644 --- a/source/blender/nodes/shader/node_shader_tree.c +++ b/source/blender/nodes/shader/node_shader_tree.c @@ -348,7 +348,9 @@ static void ntree_shader_link_builtin_group_normal( * some internal re-linking in order to avoid cycles. */ bNode *group_output_node = ntreeFindType(group_ntree, NODE_GROUP_OUTPUT); - BLI_assert(group_output_node != NULL); + if (group_output_node == NULL) { + return; + } bNodeSocket *group_output_node_displacement_socket = nodeFindSocket(group_output_node, SOCK_IN, |