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/nodes | |
| parent | 349357a7bdffcf82705598d3cfc203812dd6d9a3 (diff) | |
| parent | de0e456a6c7d6da065d275104bc2022b69874648 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_hueSatVal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c b/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c index af802e988bb..392830dcf5a 100644 --- a/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c +++ b/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c @@ -46,7 +46,7 @@ static void do_hue_sat_fac(bNode *UNUSED(node), float *out, float hue, float sat rgb_to_hsv(in[0], in[1], in[2], hsv, hsv + 1, hsv + 2); hsv[0] = fmodf(hsv[0] + hue + 0.5f, 1.0f); - hsv[1] *= clamp_f(sat, 0.0f, 1.0f); + hsv[1] = clamp_f(hsv[1] * sat, 0.0f, 1.0f); hsv[2] *= val; hsv_to_rgb(hsv[0], hsv[1], hsv[2], col, col + 1, col + 2); |