Merge branch 'blender2.7'

2 files changed, 4 insertions, 6 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);
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);