1 files changed, 25 insertions, 25 deletions

diff --git a/intern/cycles/kernel/osl/nodes/node_color.h b/intern/cycles/kernel/osl/nodes/node_color.h
index 37d092eae78..80786e4e369 100644
--- a/intern/cycles/kernel/osl/nodes/node_color.h
+++ b/intern/cycles/kernel/osl/nodes/node_color.h
@@ -18,18 +18,18 @@
 
 float color_srgb_to_scene_linear(float c)
 {
-	if(c < 0.04045)
-		return (c < 0.0)? 0.0: c * (1.0/12.92);
+	if (c < 0.04045)
+		return (c < 0.0) ? 0.0 : c * (1.0 / 12.92);
 	else
-		return pow((c + 0.055)*(1.0/1.055), 2.4);
+		return pow((c + 0.055) * (1.0 / 1.055), 2.4);
 }
 
 float color_scene_linear_to_srgb(float c)
 {
-	if(c < 0.0031308)
-		return (c < 0.0)? 0.0: c * 12.92;
-    else
-		return 1.055 * pow(c, 1.0/2.4) - 0.055;
+	if (c < 0.0031308)
+		return (c < 0.0) ? 0.0 : c * 12.92;
+	else
+		return 1.055 * pow(c, 1.0 / 2.4) - 0.055;
 }
 
 color color_srgb_to_scene_linear(color c)
@@ -61,27 +61,27 @@ color rgb_to_hsv(color rgb)
 
 	v = cmax;
 
-	if(cmax != 0.0) {
-		s = cdelta/cmax;
+	if (cmax != 0.0) {
+		s = cdelta / cmax;
 	}
 	else {
 		s = 0.0;
 		h = 0.0;
 	}
 
-	if(s == 0.0) {
+	if (s == 0.0) {
 		h = 0.0;
 	}
 	else {
-		c = (color(cmax, cmax, cmax) - rgb)/cdelta;
+		c = (color(cmax, cmax, cmax) - rgb) / cdelta;
 
-		if(rgb[0] == cmax) h = c[2] - c[1];
-		else if(rgb[1] == cmax) h = 2.0 + c[0] -  c[2];
+		if (rgb[0] == cmax) h = c[2] - c[1];
+		else if (rgb[1] == cmax) h = 2.0 + c[0] -  c[2];
 		else h = 4.0 + c[1] - c[0];
 
 		h /= 6.0;
 
-		if(h < 0.0)
+		if (h < 0.0)
 			h += 1.0;
 	}
 
@@ -97,26 +97,26 @@ color hsv_to_rgb(color hsv)
 	s = hsv[1];
 	v = hsv[2];
 
-	if(s==0.0) {
+	if (s == 0.0) {
 		rgb = color(v, v, v);
 	}
 	else {
-		if(h==1.0)
+		if (h == 1.0)
 			h = 0.0;
 		
 		h *= 6.0;
 		i = floor(h);
 		f = h - i;
 		rgb = color(f, f, f);
-		p = v*(1.0-s);
-		q = v*(1.0-(s*f));
-		t = v*(1.0-(s*(1.0-f)));
-		
-		if(i == 0.0) rgb = color(v, t, p);
-		else if(i == 1.0) rgb = color(q, v, p);
-		else if(i == 2.0) rgb = color(p, v, t);
-		else if(i == 3.0) rgb = color(p, q, v);
-		else if(i == 4.0) rgb = color(t, p, v);
+		p = v * (1.0 - s);
+		q = v * (1.0 - (s * f));
+		t = v * (1.0 - (s * (1.0 - f)));
+
+		if (i == 0.0) rgb = color(v, t, p);
+		else if (i == 1.0) rgb = color(q, v, p);
+		else if (i == 2.0) rgb = color(p, v, t);
+		else if (i == 3.0) rgb = color(p, q, v);
+		else if (i == 4.0) rgb = color(t, p, v);
 		else rgb = color(v, p, q);
 	}