From f70d2c65d85c6ad983b9155daedb0dff0c085e90 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 23 Oct 2012 13:28:22 +0000 Subject: rename api functions... - minf, maxf, mini, maxi --> min_ff, max_ff, min_ii, max_ii --- source/blender/bmesh/operators/bmo_connect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/bmesh/operators/bmo_connect.c') diff --git a/source/blender/bmesh/operators/bmo_connect.c b/source/blender/bmesh/operators/bmo_connect.c index fde475c2d6a..ebd848ff8b2 100644 --- a/source/blender/bmesh/operators/bmo_connect.c +++ b/source/blender/bmesh/operators/bmo_connect.c @@ -425,8 +425,8 @@ void bmo_bridge_loops_exec(BMesh *bm, BMOperator *op) /* merge loops of bridge faces */ if (use_merge) { - const int vert_len = mini(BLI_array_count(vv1), BLI_array_count(vv2)) - ((cl1 || cl2) ? 1 : 0); - const int edge_len = mini(BLI_array_count(ee1), BLI_array_count(ee2)); + const int vert_len = min_ii(BLI_array_count(vv1), BLI_array_count(vv2)) - ((cl1 || cl2) ? 1 : 0); + const int edge_len = min_ii(BLI_array_count(ee1), BLI_array_count(ee2)); if (merge_factor <= 0.0f) { /* 2 --> 1 */ -- cgit v1.2.3