[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16470] trunk/blender/source/blender/ blenkernel/intern/node.c: Fix for bug #17593: glsl crash using a texture node without a

[Brecht Van Lommel]

Revision: 16470
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16470
Author:   blendix
Date:     2008-09-11 12:17:17 +0200 (Thu, 11 Sep 2008)

Log Message:
-----------
Fix for bug #17593: glsl crash using a texture node without a
texture assigned.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/node.c

Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c	2008-09-11 06:17:21 UTC (rev 16469)
+++ trunk/blender/source/blender/blenkernel/intern/node.c	2008-09-11 10:17:17 UTC (rev 16470)
@@ -2378,8 +2378,8 @@
 			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 @@
 
 	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;
 	}