[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49857] trunk/blender/source/blender/ editors/interface/view2d_ops.c: confusion minf/fmin, broke msvc

[Campbell Barton]

Revision: 49857
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49857
Author:   campbellbarton
Date:     2012-08-12 19:41:47 +0000 (Sun, 12 Aug 2012)
Log Message:
-----------
confusion minf/fmin, broke msvc

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/view2d_ops.c

Modified: trunk/blender/source/blender/editors/interface/view2d_ops.c
===================================================================
--- trunk/blender/source/blender/editors/interface/view2d_ops.c	2012-08-12 19:35:47 UTC (rev 49856)
+++ trunk/blender/source/blender/editors/interface/view2d_ops.c	2012-08-12 19:41:47 UTC (rev 49857)
@@ -36,6 +36,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
+#include "BLI_math_base.h"
 
 #include "BKE_context.h"
 
@@ -1212,16 +1213,16 @@
 
 	for (i = 0; i < 2; i++) {
 		/* axis translation normalized to scale */
-		tfac = fabsf(cent_a[i] - cent_b[i]) / fmin(size_a[i], size_b[i]);
-		fac_max = fmax(fac_max, tfac);
+		tfac = fabsf(cent_a[i] - cent_b[i]) / minf(size_a[i], size_b[i]);
+		fac_max = maxf(fac_max, tfac);
 		if (fac_max >= 1.0f) break;
 
 		/* axis scale difference, x2 so doubling or half gives 1.0f */
-		tfac = (1.0f - (fmin(size_a[i], size_b[i]) / fmax(size_a[i], size_b[i]))) * 2.0f;
-		fac_max = fmax(fac_max, tfac);
+		tfac = (1.0f - (minf(size_a[i], size_b[i]) / maxf(size_a[i], size_b[i]))) * 2.0f;
+		fac_max = maxf(fac_max, tfac);
 		if (fac_max >= 1.0f) break;
 	}
-	return fmin(fac_max, 1.0f);
+	return minf(fac_max, 1.0f);
 }
 
 /* will start timer if appropriate */