Fix #24436: GLSL + Node material gives wrong color.
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 2 Nov 2010 12:18:49 +0000 (12:18 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 2 Nov 2010 12:18:49 +0000 (12:18 +0000)
source/blender/blenkernel/intern/node.c

index 41c4fece1a4a44de9860854306351dc44e2accfa..6c4c566f5b194f0f1a6e8d9feadb1da95f8f8677 100644 (file)
@@ -2718,7 +2718,7 @@ static void gpu_from_node_stack(ListBase *sockets, bNodeStack **ns, GPUNodeStack
 
                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 @@ 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 && gs[i].link;
-               ns[i]->hasoutput= gs[i].hasoutput;
                ns[i]->sockettype= gs[i].sockettype;
        }
 }