diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-14 22:00:37 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-14 22:00:37 +0300 |
| commit | 7a41c1634ba8099f1b4b94570edf8df2cf87da7a (patch) | |
| tree | fce5cf38de95ffe1df4d02108dfca8c7a960fb7c /source/blender/gpu/shaders | |
| parent | 349357a7bdffcf82705598d3cfc203812dd6d9a3 (diff) | |
| parent | de0e456a6c7d6da065d275104bc2022b69874648 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'source/blender/gpu/shaders')
| -rw-r--r-- | source/blender/gpu/shaders/gpu_shader_material.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl index d5bb157867b..fc7878dc6ab 100644 --- a/source/blender/gpu/shaders/gpu_shader_material.glsl +++ b/source/blender/gpu/shaders/gpu_shader_material.glsl @@ -857,7 +857,7 @@ void hue_sat(float hue, float sat, float value, float fac, vec4 col, out vec4 ou rgb_to_hsv(col, hsv); hsv[0] = fract(hsv[0] + hue + 0.5); - hsv[1] = hsv[1] * clamp(sat, 0.0, 1.0); + hsv[1] = clamp(hsv[1] * sat, 0.0, 1.0); hsv[2] = hsv[2] * value; hsv_to_rgb(hsv, outcol); |