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 /intern/cycles/kernel/svm/svm_hsv.h | |
| parent | 349357a7bdffcf82705598d3cfc203812dd6d9a3 (diff) | |
| parent | de0e456a6c7d6da065d275104bc2022b69874648 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/kernel/svm/svm_hsv.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_hsv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/svm/svm_hsv.h b/intern/cycles/kernel/svm/svm_hsv.h index e69a4ee9154..6f3efa639e2 100644 --- a/intern/cycles/kernel/svm/svm_hsv.h +++ b/intern/cycles/kernel/svm/svm_hsv.h @@ -38,7 +38,7 @@ ccl_device void svm_node_hsv(KernelGlobals *kg, ShaderData *sd, float *stack, ui /* remember: fmod doesn't work for negative numbers here */ color.x = fmodf(color.x + hue + 0.5f, 1.0f); - color.y *= saturate(sat); + color.y = saturate(color.y * sat); color.z *= val; color = hsv_to_rgb(color); |