code cleanup: replace MIN2/MAX2 with minf/maxf

3 files changed, 7 insertions, 7 deletions

diff --git a/source/blender/blenlib/intern/pbvh.c b/source/blender/blenlib/intern/pbvh.c
index 14f9001814c..9b05f0fc976 100644
--- a/source/blender/blenlib/intern/pbvh.c
+++ b/source/blender/blenlib/intern/pbvh.c
@@ -189,8 +189,8 @@ static void BB_expand(BB *bb, float co[3])
 {
 	int i;
 	for (i = 0; i < 3; ++i) {
-		bb->bmin[i] = MIN2(bb->bmin[i], co[i]);
-		bb->bmax[i] = MAX2(bb->bmax[i], co[i]);
+		bb->bmin[i] = minf(bb->bmin[i], co[i]);
+		bb->bmax[i] = maxf(bb->bmax[i], co[i]);
 	}
 }
 
@@ -199,8 +199,8 @@ static void BB_expand_with_bb(BB *bb, BB *bb2)
 {
 	int i;
 	for (i = 0; i < 3; ++i) {
-		bb->bmin[i] = MIN2(bb->bmin[i], bb2->bmin[i]);
-		bb->bmax[i] = MAX2(bb->bmax[i], bb2->bmax[i]);
+		bb->bmin[i] = minf(bb->bmin[i], bb2->bmin[i]);
+		bb->bmax[i] = maxf(bb->bmax[i], bb2->bmax[i]);
 	}
 }
 
diff --git a/source/blender/blenlib/intern/scanfill.c b/source/blender/blenlib/intern/scanfill.c
index 1f0bd445831..25191370130 100644
--- a/source/blender/blenlib/intern/scanfill.c
+++ b/source/blender/blenlib/intern/scanfill.c
@@ -658,7 +658,7 @@ static int scanfill(ScanFillContext *sf_ctx, PolyFill *pf)
 				if (v1 == v2 || v2 == v3) break;
 				/* printf("test verts %x %x %x\n",v1,v2,v3); */
 				miny = minf(v1->xy[1], v3->xy[1]);
-				/*  miny= MIN2(v1->xy[1],v3->xy[1]); */
+				/*  miny= minf(v1->xy[1],v3->xy[1]); */
 				sc1 = sc + 1;
 				test = 0;
 
diff --git a/source/blender/blenlib/intern/voronoi.c b/source/blender/blenlib/intern/voronoi.c
index dc76fb1493d..f61df9c11f5 100644
--- a/source/blender/blenlib/intern/voronoi.c
+++ b/source/blender/blenlib/intern/voronoi.c
@@ -259,9 +259,9 @@ static float voronoi_getXOfEdge(VoronoiProcess *process, VoronoiParabola *par, f
 	x2 = (-b - sqrtf(disc)) / (2 * a);
 
 	if (p[1] < r[1])
-		ry = MAX2(x1, x2);
+		ry = maxf(x1, x2);
 	else
-		ry = MIN2(x1, x2);
+		ry = minf(x1, x2);
 
 	return ry;
 }