[Bf-blender-cvs] [56da112ae0b] master: Fix T53360: crash with GLSL bump mapping and missing group output node.

[Brecht Van Lommel]

Commit: 56da112ae0bb5210c883d3325644d467f1eda137
Author: Brecht Van Lommel
Date:   Thu Nov 23 18:12:32 2017 +0100
Branches: master
https://developer.blender.org/rB56da112ae0bb5210c883d3325644d467f1eda137

Fix T53360: crash with GLSL bump mapping and missing group output node.

===================================================================

M	source/blender/nodes/shader/node_shader_tree.c

===================================================================

diff --git a/source/blender/nodes/shader/node_shader_tree.c b/source/blender/nodes/shader/node_shader_tree.c
index 40d1cfdfcb0..b4cdb158526 100644
--- a/source/blender/nodes/shader/node_shader_tree.c
+++ b/source/blender/nodes/shader/node_shader_tree.c
@@ -337,7 +337,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,