diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-13 18:58:54 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-13 19:06:30 +0300 |
| commit | ec559912fbcb51b713e1f33d4931af5fb52fd85b (patch) | |
| tree | 7e8d2671055f1a606671c3e5f2de821cda9b4e0e /intern/cycles/kernel/shaders/node_hsv.osl | |
| parent | 79f5b825a9779309a737bcbdfe3d68d760a80e62 (diff) | |
Fix T61470: inconsistent HSV node results with saturation > 1.0.
Values outside the 0..1 range produce negative colors, so now clamp to that
range everywhere. Also fixes improper handling of hue > 2.0 in some places.
Diffstat (limited to 'intern/cycles/kernel/shaders/node_hsv.osl')
| -rw-r--r-- | intern/cycles/kernel/shaders/node_hsv.osl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/intern/cycles/kernel/shaders/node_hsv.osl b/intern/cycles/kernel/shaders/node_hsv.osl index 8d9e50fed6b..9d7b7cde23a 100644 --- a/intern/cycles/kernel/shaders/node_hsv.osl +++ b/intern/cycles/kernel/shaders/node_hsv.osl @@ -28,9 +28,8 @@ shader node_hsv( color Color = rgb_to_hsv(ColorIn); // remember: fmod doesn't work for negative numbers - Color[0] += Hue + 0.5; - Color[0] = fmod(Color[0], 1.0); - Color[1] *= Saturation; + Color[0] = fmod(Color[0] + Hue + 0.5, 1.0); + Color[1] *= clamp(Saturation, 0.0, 1.0); Color[2] *= Value; Color = hsv_to_rgb(Color); |