diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2015-01-27 18:34:27 +0300 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2015-01-27 18:34:40 +0300 |
commit | 332cf291e4b8b104252f34383193aed2f4c814e0 (patch) | |
tree | a2d683b361648b4f22017ac57ddee8e6423e20b7 /source/blender/gpu/shaders | |
parent | 2d86f58e0f773207eb7a3ff8ccbd58b85263fbe3 (diff) |
Fix T43250, lamp node did not use energy when used with nodes in blender
internal.
Similar to fix for T42074 we need to multiply with energy -after-
texture application.
Diffstat (limited to 'source/blender/gpu/shaders')
-rw-r--r-- | source/blender/gpu/shaders/gpu_shader_material.glsl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl index a79bb239801..a7bb4fe16f7 100644 --- a/source/blender/gpu/shaders/gpu_shader_material.glsl +++ b/source/blender/gpu/shaders/gpu_shader_material.glsl @@ -169,9 +169,9 @@ void camera(vec3 co, out vec3 outview, out float outdepth, out float outdist) outview = normalize(co); } -void lamp(vec4 col, vec3 lv, float dist, vec3 shadow, float visifac, out vec4 outcol, out vec3 outlv, out float outdist, out vec4 outshadow, out float outvisifac) +void lamp(vec4 col, float energy, vec3 lv, float dist, vec3 shadow, float visifac, out vec4 outcol, out vec3 outlv, out float outdist, out vec4 outshadow, out float outvisifac) { - outcol = col; + outcol = col * energy; outlv = lv; outdist = dist; outshadow = vec4(shadow, 1.0); |