diff options
author | Alexander Romanov <a.romanov@blend4web.com> | 2016-08-30 17:15:26 +0300 |
---|---|---|
committer | Alexander Romanov <a.romanov@blend4web.com> | 2016-08-30 17:15:26 +0300 |
commit | 959b06b3c85fc8a6df2b9983e016ee59e9491b64 (patch) | |
tree | f3e873e4a2e9079ad473c1bad475fdfd8c05025d /source/blender/gpu | |
parent | 43dcfcb27a30b98e13d1d7f516db618f4a306859 (diff) |
Fix type mismatch causing the buffer overflow in D810
Diffstat (limited to 'source/blender/gpu')
-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 845a78720ba..119bfb61fec 100644 --- a/source/blender/gpu/shaders/gpu_shader_material.glsl +++ b/source/blender/gpu/shaders/gpu_shader_material.glsl @@ -2185,11 +2185,11 @@ void shade_madd_clamped(vec4 col, vec4 col1, vec4 col2, out vec4 outcol) outcol = col + max(col1 * col2, vec4(0.0, 0.0, 0.0, 0.0)); } -void env_apply(vec4 col, vec4 hor, vec4 zen, vec4 f, mat4 vm, vec3 vn, out vec4 outcol) +void env_apply(vec4 col, vec3 hor, vec3 zen, vec4 f, mat4 vm, vec3 vn, out vec4 outcol) { vec3 vv = normalize(vm[2].xyz); float skyfac = 0.5 * (1.0 + dot(vn, -vv)); - outcol = col + f * mix(hor, zen, skyfac); + outcol = col + f * vec4(mix(hor, zen, skyfac), 0); } void shade_maddf(vec4 col, float f, vec4 col1, out vec4 outcol) |