Code cleanup: rename BM_face_legal_splits -> BM_face_splits_check_legal
authorCampbell Barton <ideasman42@gmail.com>
Tue, 13 May 2014 07:46:27 +0000 (17:46 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 13 May 2014 07:48:25 +0000 (17:48 +1000)
source/blender/bmesh/intern/bmesh_polygon.c
source/blender/bmesh/intern/bmesh_polygon.h
source/blender/bmesh/operators/bmo_connect.c
source/blender/bmesh/operators/bmo_connect_nonplanar.c
source/blender/bmesh/operators/bmo_subdivide.c
source/blender/editors/mesh/editmesh_knife.c

index 08619cd9699562ecbd3f7b94c969caed238b5513..32b9d81a2233ad988224768c52dc049540ef67e7 100644 (file)
@@ -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;
index 28fc314b329851e66bcb673373f5cfe1954b1266..7200d47bc1544cf679d32af31c10f64298ccca0f 100644 (file)
@@ -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();
index 2e45cb9fec1d345a9ca0d3d4e5fdd2abe2b47f26..f7a14f430e821c8026906597a9fbbefb2529f71a 100644 (file)
@@ -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++) {
index 9e9f1cbf0d4995240a96f3ca3074ee44875b19fd..be325fc9adc0454e3c8e89fbf69001361ec2e8e8 100644 (file)
@@ -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;
index 8d948fbcc698ee1a578093831ae733406c2acb07..c9b35e895aa49ffd0d9d0bd5e556ca2f459fb8e2 100644 (file)
@@ -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]) {
index 366a8253849f06c49457775841c5a22c2316b918..2ef68b2735850357537eef8f6f957a70800b6468 100644 (file)
@@ -2229,7 +2229,7 @@ static bool knife_verts_edge_in_face(KnifeVert *v1, KnifeVert *v2, BMFace *f)
                return true;
        if (l1 && l2) {
                /* Can have case where v1 and v2 are on shared chain between two faces.
-                * BM_face_legal_splits does visibility and self-intersection tests,
+                * BM_face_splits_check_legal does visibility and self-intersection tests,
                 * but it is expensive and maybe a bit buggy, so use a simple
                 * "is the midpoint in the face" test */
                mid_v3_v3v3(mid, v1->co, v2->co);