Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Tönne <lukas.toenne@gmail.com>2014-01-27 15:26:49 +0400
committerLukas Tönne <lukas.toenne@gmail.com>2014-01-27 15:27:30 +0400
commit21c56f754fd60ae82fc42a1f781afecde5227282 (patch)
tree75bd9fa7cba15de6869d306c0f6b3fa13ea63599 /source/blender/nodes
parent31d679b667cd121a9bcbe32fedc8ab768611b963 (diff)
Fix T38355: Crash with Shader Node Group with missing datablock,
only in "Material" viewport shading.
Diffstat (limited to 'source/blender/nodes')
-rw-r--r--source/blender/nodes/shader/nodes/node_shader_common.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_common.c b/source/blender/nodes/shader/nodes/node_shader_common.c
index e229fc75686..0ea4f949597 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));