[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37551] branches/cycles/source/blender/ nodes/intern/SHD_nodes/SHD_tex_blend.c: Cycles: fix for windows compile error.

[Brecht Van Lommel]

Revision: 37551
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37551
Author:   blendix
Date:     2011-06-16 13:24:44 +0000 (Thu, 16 Jun 2011)
Log Message:
-----------
Cycles: fix for windows compile error.

Modified Paths:
--------------
    branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_blend.c

Modified: branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_blend.c
===================================================================
--- branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_blend.c	2011-06-16 12:48:25 UTC (rev 37550)
+++ branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_blend.c	2011-06-16 13:24:44 UTC (rev 37551)
@@ -46,11 +46,11 @@
 		return (1.0f + x)/2.0f;
 	}
 	else if(type == SHD_BLEND_QUADRATIC) {
-		float r = fmaxf((1.0f + x)/2.0f, 0.0f);
+		float r = MAX2((1.0f + x)/2.0f, 0.0f);
 		return r*r;
 	}
 	else if(type == SHD_BLEND_EASING) {
-		float r = fminf(fmaxf((1.0f + x)/2.0f, 0.0f), 1.0f);
+		float r = MIN2(MAX2((1.0f + x)/2.0f, 0.0f), 1.0f);
 		float t = r*r;
 		
 		return (3.0f*t - 2.0f*t*r);
@@ -62,7 +62,7 @@
 		return atan2(y, x)/(2.0f*(float)M_PI) + 0.5f;
 	}
 	else {
-		float r = fmaxf(1.0f - sqrtf(x*x + y*y + p[2]*p[2]), 0.0f);
+		float r = MAX2(1.0f - sqrtf(x*x + y*y + p[2]*p[2]), 0.0f);
 
 		if(type == SHD_BLEND_QUADRATIC_SPHERE)
 			return r*r;