From ec559912fbcb51b713e1f33d4931af5fb52fd85b Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 13 Feb 2019 16:58:54 +0100 Subject: 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. --- intern/cycles/kernel/shaders/node_hsv.osl | 5 ++--- intern/cycles/kernel/svm/svm_hsv.h | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'intern/cycles/kernel') 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); diff --git a/intern/cycles/kernel/svm/svm_hsv.h b/intern/cycles/kernel/svm/svm_hsv.h index 41538d1138d..e69a4ee9154 100644 --- a/intern/cycles/kernel/svm/svm_hsv.h +++ b/intern/cycles/kernel/svm/svm_hsv.h @@ -37,9 +37,8 @@ ccl_device void svm_node_hsv(KernelGlobals *kg, ShaderData *sd, float *stack, ui color = rgb_to_hsv(color); /* remember: fmod doesn't work for negative numbers here */ - color.x += hue + 0.5f; - color.x = fmodf(color.x, 1.0f); - color.y *= sat; + color.x = fmodf(color.x + hue + 0.5f, 1.0f); + color.y *= saturate(sat); color.z *= val; color = hsv_to_rgb(color); -- cgit v1.2.3