diff options
author | Thomas Dinges <blender@dingto.org> | 2014-06-20 11:36:11 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2014-06-20 11:36:25 +0400 |
commit | a5a869c579de97437deded3482d9f04555a8ee26 (patch) | |
tree | 4e667d5a425e716fc527f93641ccee3e4b2551f3 | |
parent | 8660a0cab3e0f5b05a14b362e9a5174acf969c54 (diff) |
Fix 2 GLSL errors, with Cycles Hair BSDF.
-rw-r--r-- | source/blender/gpu/shaders/gpu_shader_material.glsl | 2 | ||||
-rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_bsdf_hair.c | 3 |
2 files changed, 1 insertions, 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); } |