diff options
Diffstat (limited to 'source/blender/bmesh')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_polygon.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_polygon.h | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/operators/bmo_connect.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/operators/bmo_connect_nonplanar.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/operators/bmo_subdivide.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c index 08619cd9699..32b9d81a223 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.c +++ b/source/blender/bmesh/intern/bmesh_polygon.c @@ -986,7 +986,7 @@ void BM_face_triangulate(BMesh *bm, BMFace *f, * intersecting splits, only the first of the set of intersecting * splits survives */ -void BM_face_legal_splits(BMFace *f, BMLoop *(*loops)[2], int len) +void BM_face_splits_check_legal(BMFace *f, BMLoop *(*loops)[2], int len) { const int len2 = len * 2; BMLoop *l; diff --git a/source/blender/bmesh/intern/bmesh_polygon.h b/source/blender/bmesh/intern/bmesh_polygon.h index 28fc314b329..7200d47bc15 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.h +++ b/source/blender/bmesh/intern/bmesh_polygon.h @@ -62,7 +62,7 @@ void BM_face_triangulate(BMesh *bm, BMFace *f, const int quad_method, const int ngon_method, const bool use_tag) ATTR_NONNULL(1, 2); -void BM_face_legal_splits(BMFace *f, BMLoop *(*loops)[2], int len) ATTR_NONNULL(); +void BM_face_splits_check_legal(BMFace *f, BMLoop *(*loops)[2], int len) ATTR_NONNULL(); void BM_face_as_array_vert_tri(BMFace *f, BMVert *r_verts[3]) ATTR_NONNULL(); void BM_face_as_array_vert_quad(BMFace *f, BMVert *r_verts[4]) ATTR_NONNULL(); diff --git a/source/blender/bmesh/operators/bmo_connect.c b/source/blender/bmesh/operators/bmo_connect.c index 2e45cb9fec1..f7a14f430e8 100644 --- a/source/blender/bmesh/operators/bmo_connect.c +++ b/source/blender/bmesh/operators/bmo_connect.c @@ -82,7 +82,7 @@ static int bm_face_connect_verts(BMesh *bm, BMFace *f, const bool check_degenera } if (check_degenerate) { - BM_face_legal_splits(f, loops_split, STACK_SIZE(loops_split)); + BM_face_splits_check_legal(f, loops_split, STACK_SIZE(loops_split)); } for (i = 0; i < STACK_SIZE(loops_split); i++) { diff --git a/source/blender/bmesh/operators/bmo_connect_nonplanar.c b/source/blender/bmesh/operators/bmo_connect_nonplanar.c index 9e9f1cbf0d4..be325fc9adc 100644 --- a/source/blender/bmesh/operators/bmo_connect_nonplanar.c +++ b/source/blender/bmesh/operators/bmo_connect_nonplanar.c @@ -102,7 +102,7 @@ static bool bm_face_split_find(BMFace *f, BMLoop *l_pair[2], float *r_angle) if (err_test < err_best) { /* check we're legal (we could batch this) */ BMLoop *l_split[2] = {l_a, l_b}; - BM_face_legal_splits(f, &l_split, 1); + BM_face_splits_check_legal(f, &l_split, 1); if (l_split[0]) { err_best = err_test; l_pair[0] = l_a; diff --git a/source/blender/bmesh/operators/bmo_subdivide.c b/source/blender/bmesh/operators/bmo_subdivide.c index 8d948fbcc69..c9b35e895aa 100644 --- a/source/blender/bmesh/operators/bmo_subdivide.c +++ b/source/blender/bmesh/operators/bmo_subdivide.c @@ -1113,7 +1113,7 @@ void bmo_subdivide_edges_exec(BMesh *bm, BMOperator *op) * - concave corner of an ngon. * - 2 edges being used in 2+ ngons. */ -// BM_face_legal_splits(face, loops_split, BLI_array_count(loops_split)); +// BM_face_splits_check_legal(face, loops_split, BLI_array_count(loops_split)); for (j = 0; j < BLI_array_count(loops_split); j++) { if (loops_split[j][0]) { |