From 5eb1d5e3dcf4160b62118935c803f411b7283e62 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 11 Sep 2008 10:17:17 +0000 Subject: [PATCH] Fix for bug #17593: glsl crash using a texture node without a texture assigned. --- source/blender/blenkernel/intern/node.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 4dfe651c01f..94a21cdd5df 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -2378,8 +2378,8 @@ static void gpu_from_node_stack(ListBase *sockets, bNodeStack **ns, GPUNodeStack gs[i].type= GPU_NONE; gs[i].name = ""; - gs[i].hasinput= ns[i]->hasinput; - gs[i].hasoutput= ns[i]->hasinput; + gs[i].hasinput= ns[i]->hasinput && ns[i]->data; + gs[i].hasoutput= ns[i]->hasinput && ns[i]->data; gs[i].sockettype= ns[i]->sockettype; } @@ -2393,7 +2393,7 @@ static void data_from_gpu_stack(ListBase *sockets, bNodeStack **ns, GPUNodeStack for (sock=sockets->first, i=0; sock; sock=sock->next, i++) { ns[i]->data= gs[i].link; - ns[i]->hasinput= gs[i].hasinput; + ns[i]->hasinput= gs[i].hasinput && gs[i].link; ns[i]->hasoutput= gs[i].hasoutput; ns[i]->sockettype= gs[i].sockettype; }