From a5a869c579de97437deded3482d9f04555a8ee26 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Fri, 20 Jun 2014 09:36:11 +0200 Subject: Fix 2 GLSL errors, with Cycles Hair BSDF. --- source/blender/gpu/shaders/gpu_shader_material.glsl | 2 +- source/blender/nodes/shader/nodes/node_shader_bsdf_hair.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl index aad675c9494..d5d0c7ef454 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 b48a4be9f7a..dbc8807a845 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); } -- cgit v1.2.3