[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32839] trunk/blender/source/blender/ blenkernel/intern/node.c: Fix #24436: GLSL + Node material gives wrong color.

[Brecht Van Lommel]

Revision: 32839
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32839
Author:   blendix
Date:     2010-11-02 13:18:49 +0100 (Tue, 02 Nov 2010)

Log Message:
-----------
Fix #24436: GLSL + Node material gives wrong color.

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	2010-11-02 11:41:25 UTC (rev 32838)
+++ trunk/blender/source/blender/blenkernel/intern/node.c	2010-11-02 12:18:49 UTC (rev 32839)
@@ -2718,7 +2718,7 @@
 
 		gs[i].name = "";
 		gs[i].hasinput= ns[i]->hasinput && ns[i]->data;
-		gs[i].hasoutput= ns[i]->hasinput && ns[i]->data;
+		gs[i].hasoutput= ns[i]->hasoutput && ns[i]->data;
 		gs[i].sockettype= ns[i]->sockettype;
 	}
 
@@ -2732,8 +2732,6 @@
 
 	for (sock=sockets->first, i=0; sock; sock=sock->next, i++) {
 		ns[i]->data= gs[i].link;
-		ns[i]->hasinput= gs[i].hasinput && gs[i].link;
-		ns[i]->hasoutput= gs[i].hasoutput;
 		ns[i]->sockettype= gs[i].sockettype;
 	}
 }