diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-10-23 17:28:22 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-23 17:28:22 +0400 |
| commit | f70d2c65d85c6ad983b9155daedb0dff0c085e90 (patch) | |
| tree | 726eb4833b6c45eaa372f779af50ae6b379c238e /source/blender/bmesh/operators/bmo_connect.c | |
| parent | 9599c2a02b65864e014ec4713629c96c0662e31e (diff) | |
rename api functions...
- minf, maxf, mini, maxi --> min_ff, max_ff, min_ii, max_ii
Diffstat (limited to 'source/blender/bmesh/operators/bmo_connect.c')
| -rw-r--r-- | source/blender/bmesh/operators/bmo_connect.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 */ |