Commit: 971affb4366634da35a7d9637243d451f0b227e2
Author: Sergey Sharybin
Date: Tue Jul 28 15:56:34 2015 +0200
Branches: master
https://developer.blender.org/rB971affb4366634da35a7d9637243d451f0b227e2
Fix T45590: Some more missing glsl functions
Also SSS node was using wrong Normal input index.
===================================================================
M source/blender/gpu/shaders/gpu_shader_material.glsl
M source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c
===================================================================
diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl
b/source/blender/gpu/shaders/gpu_shader_material.glsl
index ea7ab05..54864b2 100644
--- a/source/blender/gpu/shaders/gpu_shader_material.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_material.glsl
@@ -2267,6 +2267,11 @@ void node_bsdf_refraction(vec4 color, float roughness,
float ior, vec3 N, out ve
node_bsdf_diffuse(color, 0.0, N, result);
}
+void node_ambient_occlusion(vec4 color, out vec4 result)
+{
+ result = color;
+}
+
/* emission */
void node_emission(vec4 color, float strength, vec3 N, out vec4 result)
diff --git
a/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c
b/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c
index 9fe56d4..8c83fa4 100644
--- a/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c
+++ b/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c
@@ -60,8 +60,8 @@ static void node_shader_init_subsurface_scattering(bNodeTree
*UNUSED(ntree), bNo
static int node_shader_gpu_subsurface_scattering(GPUMaterial *mat, bNode
*UNUSED(node), bNodeExecData *UNUSED(execdata), GPUNodeStack *in, GPUNodeStack
*out)
{
- if (!in[1].link)
- in[1].link = GPU_builtin(GPU_VIEW_NORMAL);
+ if (!in[5].link)
+ in[5].link = GPU_builtin(GPU_VIEW_NORMAL);
return GPU_stack_link(mat, "node_subsurface_scattering", in, out);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
