[Bf-blender-cvs] [a5a869c] master: Fix 2 GLSL errors, with Cycles Hair BSDF.

[Thomas Dinges]

Commit: a5a869c579de97437deded3482d9f04555a8ee26
Author: Thomas Dinges
Date:   Fri Jun 20 09:36:11 2014 +0200
https://developer.blender.org/rBa5a869c579de97437deded3482d9f04555a8ee26

Fix 2 GLSL errors, with Cycles Hair BSDF.

===================================================================

M       source/blender/gpu/shaders/gpu_shader_material.glsl
M       source/blender/nodes/shader/nodes/node_shader_bsdf_hair.c

===================================================================

diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl 
b/source/blender/gpu/shaders/gpu_shader_material.glsl
index aad675c..d5d0c7e 100644
--- a/source/blender/gpu/shaders/gpu_shader_material.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_material.glsl
@@ -2181,7 +2181,7 @@ void node_subsurface_scattering(vec4 color, float scale, 
vec3 radius, float shar
        node_bsdf_diffuse(color, 0.0, N, result);
 }
 
-void node_bsdf_hair(vec4 color, float roughnessu, float roughnessv, out vec4 
result)
+void node_bsdf_hair(vec4 color, float offset, float roughnessu, float 
roughnessv, out vec4 result)
 {
        result = color;
 }
diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_hair.c 
b/source/blender/nodes/shader/nodes/node_shader_bsdf_hair.c
index b48a4be..dbc8807 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bsdf_hair.c
+++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_hair.c
@@ -43,9 +43,6 @@ static bNodeSocketTemplate sh_node_bsdf_hair_out[] = {
 
 static int node_shader_gpu_bsdf_hair(GPUMaterial *mat, bNode *UNUSED(node), 
bNodeExecData *UNUSED(execdata), GPUNodeStack *in, GPUNodeStack *out)
 {
-       if (!in[2].link)
-               in[2].link = GPU_builtin(GPU_VIEW_NORMAL);
-
        return GPU_stack_link(mat, "node_bsdf_hair", in, out);
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs