bmesh api name change, add _count suffix for BM_*_share functions.
authorCampbell Barton <ideasman42@gmail.com>
Sun, 26 Feb 2012 19:46:12 +0000 (19:46 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 26 Feb 2012 19:46:12 +0000 (19:46 +0000)
source/blender/bmesh/bmesh_queries.h
source/blender/bmesh/intern/bmesh_mods.c
source/blender/bmesh/intern/bmesh_newcore.c
source/blender/bmesh/intern/bmesh_queries.c
source/blender/bmesh/operators/bmo_create.c
source/blender/bmesh/operators/bmo_subdivide.c
source/blender/bmesh/tools/BME_bevel.c
source/blender/editors/mesh/loopcut.c

index e1eeaf8ee1776fdf09be0c4f688fee065f63991a..b99dff33f6815d676ba114b8ff978a8ddf104866 100644 (file)
@@ -102,13 +102,13 @@ int BM_face_exists(BMesh *bm, BMVert **varr, int len, BMFace **existface);
 
 
 /* returns number of edges f1 and f2 share. */
-int BM_face_share_edges(struct BMFace *f1, struct BMFace *f2);
+int BM_face_share_edge_count(struct BMFace *f1, struct BMFace *f2);
 
 /* returns number of faces e1 and e2 share. */
-int BM_edge_share_faces(struct BMEdge *e1, struct BMEdge *e2);
+int BM_edge_share_face_count(struct BMEdge *e1, struct BMEdge *e2);
 
 /* returns bool 1/0 if the edges share a vertex */
-int BM_edge_share_vert(struct BMEdge *e1, struct BMEdge *e2);
+int BM_edge_share_vert_count(struct BMEdge *e1, struct BMEdge *e2);
 
 /* edge verts in winding order from face */
 void BM_edge_ordered_verts(struct BMEdge *edge, struct BMVert **r_v1, struct BMVert **r_v2);
index bb9ad533308d45a7c00f208f8dfc00c23c555aa4..4543eaf4109ae473571f26c21a6af5d1f1550588 100644 (file)
@@ -108,7 +108,7 @@ int BM_disk_dissolve(BMesh *bm, BMVert *v)
                e = v->e;
                do {
                        e = bmesh_disk_nextedge(e, v);
-                       if (!(BM_edge_share_faces(e, v->e))) {
+                       if (!(BM_edge_share_face_count(e, v->e))) {
                                keepedge = e;
                                baseedge = v->e;
                                break;
index 980066fad2589a1e5c7d59371de147778a3224e1..deaadad2f4c0c5aff301db324bea92cafa84a372 100644 (file)
@@ -1650,7 +1650,7 @@ BMFace *bmesh_jfke(BMesh *bm, BMFace *f1, BMFace *f2, BMEdge *e)
        }
 
        /* validate only one shared edg */
-       shared = BM_face_share_edges(f1, f2);
+       shared = BM_face_share_edge_count(f1, f2);
        if (shared > 1) {
                return NULL;
        }
index a8c4cd718455aacd6bd64026470e925afd01b504..a0040f26efbcede682faf6641f24d3c0f969ffbf 100644 (file)
@@ -450,7 +450,7 @@ int BM_edge_is_boundary(BMEdge *e)
  *     Integer
  */
 
-int BM_face_share_edges(BMFace *f1, BMFace *f2)
+int BM_face_share_edge_count(BMFace *f1, BMFace *f2)
 {
        BMLoop *l_iter;
        BMLoop *l_first;
@@ -474,7 +474,7 @@ int BM_face_share_edges(BMFace *f1, BMFace *f2)
  *
  */
 
-int BM_edge_share_faces(BMEdge *e1, BMEdge *e2)
+int BM_edge_share_face_count(BMEdge *e1, BMEdge *e2)
 {
        BMLoop *l;
        BMFace *f;
@@ -500,7 +500,7 @@ int BM_edge_share_faces(BMEdge *e1, BMEdge *e2)
  *
  */
 
-int BM_edge_share_vert(struct BMEdge *e1, struct BMEdge *e2)
+int BM_edge_share_vert_count(struct BMEdge *e1, struct BMEdge *e2)
 {
        return (e1->v1 == e2->v1 ||
                e1->v1 == e2->v2 ||
index b93e12fbfc45e50c970ed3ad331b183a3ae6f1c3..8a928669177a6e68f941867862c7f1a402b20827 100644 (file)
@@ -1140,10 +1140,10 @@ void bmesh_edgenet_prepare(BMesh *bm, BMOperator *op)
        }
 
        if (edges1 && BLI_array_count(edges1) > 2 &&
-           BM_edge_share_vert(edges1[0], edges1[BLI_array_count(edges1) - 1]))
+           BM_edge_share_vert_count(edges1[0], edges1[BLI_array_count(edges1) - 1]))
        {
                if (edges2 && BLI_array_count(edges2) > 2 &&
-                   BM_edge_share_vert(edges2[0], edges2[BLI_array_count(edges2) - 1]))
+                   BM_edge_share_vert_count(edges2[0], edges2[BLI_array_count(edges2) - 1]))
                {
                        BLI_array_free(edges1);
                        BLI_array_free(edges2);
@@ -1156,7 +1156,7 @@ void bmesh_edgenet_prepare(BMesh *bm, BMOperator *op)
        }
 
        if (edges2 && BLI_array_count(edges2) > 2 &&
-           BM_edge_share_vert(edges2[0], edges2[BLI_array_count(edges2) - 1]))
+           BM_edge_share_vert_count(edges2[0], edges2[BLI_array_count(edges2) - 1]))
        {
                edges2 = NULL;
        }
index 7d90a6b71cae53cb959f8159024d71650a2a0aa9..a983851891c0dcceb390dcc18f512fe0b47d2f7a 100644 (file)
@@ -792,7 +792,7 @@ void esubdivide_exec(BMesh *bmesh, BMOperator *op)
                }
 
                /* make sure the two edges have a valid angle to each othe */
-               if (totesel == 2 && BM_edge_share_vert(e1, e2)) {
+               if (totesel == 2 && BM_edge_share_vert_count(e1, e2)) {
                        float angle;
 
                        sub_v3_v3v3(vec1, e1->v2->co, e1->v1->co);
index 385c56627164112231ddf8fce9652aceffa668c4..758e2479dd3903049c971e8686bcd9718d6431b8 100644 (file)
@@ -829,7 +829,7 @@ static void bevel_init_edges(BMesh *bm, int options, BME_TransData_Head *td)
        /* clean up edges with 2 faces that share more than one edg */
        BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
                if(BMO_elem_flag_test(bm, e, BME_BEVEL_BEVEL)) {
-                       count = BM_face_share_edges(e->l->f, e->l->radial_next->f);
+                       count = BM_face_share_edge_count(e->l->f, e->l->radial_next->f);
                        if(count > 1) BMO_elem_flag_disable(bm, e, BME_BEVEL_BEVEL);
                }
        }
index dbcc0447a8918034bb32bbfac6ef062dd13572b6..aee62ef0d29776d689c3a724603c67b723049eb5 100644 (file)
@@ -255,7 +255,7 @@ static void edgering_sel(tringselOpData *lcd, int previewlines, int select)
                lasteed = eed;
        }
        
-       if (lasteed != startedge && BM_edge_share_faces(lasteed, startedge)) {
+       if (lasteed != startedge && BM_edge_share_face_count(lasteed, startedge)) {
                v[1][0] = v[0][0];
                v[1][1] = v[0][1];