1 files changed, 1 insertions, 73 deletions
diff --git a/intern/cycles/kernel/osl/nodes/node_mix.osl b/intern/cycles/kernel/osl/nodes/node_mix.osl
index 582aa7b3c60..8a462c995d3 100644
--- a/intern/cycles/kernel/osl/nodes/node_mix.osl
+++ b/intern/cycles/kernel/osl/nodes/node_mix.osl
@@ -17,79 +17,7 @@
  */
 
 #include "stdosl.h"
-
-color rgb_to_hsv(color rgb)
-{
-	float cmax, cmin, h, s, v, cdelta;
-	color c;
-
-	cmax = max(rgb[0], max(rgb[1], rgb[2]));
-	cmin = min(rgb[0], min(rgb[1], rgb[2]));
-	cdelta = cmax - cmin;
-
-	v = cmax;
-
-	if(cmax != 0.0) {
-		s = cdelta/cmax;
-	}
-	else {
-		s = 0.0;
-		h = 0.0;
-	}
-
-	if(s == 0.0) {
-		h = 0.0;
-	}
-	else {
-		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];
-		else h = 4.0 + c[1] - c[0];
-
-		h /= 6.0;
-
-		if(h < 0.0)
-			h += 1.0;
-	}
-
-	return color(h, s, v);
-}
-
-color hsv_to_rgb(color hsv)
-{
-	float i, f, p, q, t, h, s, v;
-	color rgb;
-
-	h = hsv[0];
-	s = hsv[1];
-	v = hsv[2];
-
-	if(s==0.0) {
-		rgb = color(v, v, v);
-	}
-	else {
-		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);
-		else rgb = color(v, p, q);
-	}
-
-	return rgb;
-}
+#include "node_color.h"
 
 color node_mix_blend(float t, color col1, color col2)
 {