[Bf-blender-cvs] [21c56f7] master: Fix T38355: Crash with Shader Node Group with missing datablock, only in "Material" viewport shading.

Lukas Tönne noreply at git.blender.org
Mon Jan 27 12:32:20 CET 2014


Commit: 21c56f754fd60ae82fc42a1f781afecde5227282
Author: Lukas Tönne
Date:   Mon Jan 27 12:26:49 2014 +0100
https://developer.blender.org/rB21c56f754fd60ae82fc42a1f781afecde5227282

Fix T38355: Crash with Shader Node Group with missing datablock,
only in "Material" viewport shading.

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

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

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

diff --git a/source/blender/nodes/shader/nodes/node_shader_common.c b/source/blender/nodes/shader/nodes/node_shader_common.c
index e229fc7..0ea4f94 100644
--- a/source/blender/nodes/shader/nodes/node_shader_common.c
+++ b/source/blender/nodes/shader/nodes/node_shader_common.c
@@ -211,6 +211,9 @@ static int gpu_group_execute(GPUMaterial *mat, bNode *node, bNodeExecData *execd
 {
 	bNodeTreeExec *exec = execdata->data;
 	
+	if (!node->id)
+		return 0;
+	
 	group_gpu_copy_inputs(node, in, exec->stack);
 #if 0   /* XXX NODE_GROUP_EDIT is deprecated, depends on node space */
 	ntreeExecGPUNodes(exec, mat, (node->flag & NODE_GROUP_EDIT));




More information about the Bf-blender-cvs mailing list