Merge branch 'master' into blender2.8
[blender.git] / source / blender / nodes / shader / node_shader_tree.c
index dc48aa324b250ece6cc26177de7f96988a012c5a..bd22a2be647b06b5bf5ce1f26ce2630bf6c34de9 100644 (file)
@@ -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,