diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-06-27 00:15:02 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-06-27 00:15:02 +0400 |
commit | 5fac3d9db5c10499e8c2142a51d4feeb74b23df3 (patch) | |
tree | 20b2c5d79b53bfe7fcb41486b1f160bb162e9ae4 /source/blender/bmesh | |
parent | 2daa901ec025e30818a977664e64ab99e1fcf23e (diff) |
remove bmesh arg from BM_face_legal_splits(), don't use a bmesh iterator.
Diffstat (limited to 'source/blender/bmesh')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_polygon.c | 8 | ||||
-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_subdivide.c | 2 |
4 files changed, 5 insertions, 9 deletions
diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c index 3d0ea4e9aed..3f12db46b4c 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.c +++ b/source/blender/bmesh/intern/bmesh_polygon.c @@ -1025,9 +1025,8 @@ 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(BMesh *bm, BMFace *f, BMLoop *(*loops)[2], int len) +void BM_face_legal_splits(BMFace *f, BMLoop *(*loops)[2], int len) { - BMIter iter; BMLoop *l; float v1[3], v2[3], v3[3] /*, v4[3 */, no[3], mid[3], *p1, *p2, *p3, *p4; float out[3] = {-FLT_MAX, -FLT_MAX, 0.0f}; @@ -1036,12 +1035,9 @@ void BM_face_legal_splits(BMesh *bm, BMFace *f, BMLoop *(*loops)[2], int len) float fac1 = 1.0000001f, fac2 = 0.9f; //9999f; //0.999f; int i, j, a = 0, clen; - i = 0; - l = BM_iter_new(&iter, bm, BM_LOOPS_OF_FACE, f); - for ( ; l; l = BM_iter_step(&iter)) { + for (i = 0, l = BM_FACE_FIRST_LOOP(f); i < f->len; i++, l = l->next) { BM_elem_index_set(l, i); /* set_loop */ copy_v3_v3(projverts[i], l->v->co); - i++; } for (i = 0; i < len; i++) { diff --git a/source/blender/bmesh/intern/bmesh_polygon.h b/source/blender/bmesh/intern/bmesh_polygon.h index 428a98e776c..54013cc0cfa 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.h +++ b/source/blender/bmesh/intern/bmesh_polygon.h @@ -55,7 +55,7 @@ bool BM_face_point_inside_test(BMFace *f, const float co[3]); void BM_face_triangulate(BMesh *bm, BMFace *f, BMFace **newfaces, const bool use_beauty, const bool use_tag); -void BM_face_legal_splits(BMesh *bm, BMFace *f, BMLoop *(*loops)[2], int len); +void BM_face_legal_splits(BMFace *f, BMLoop *(*loops)[2], int len); void BM_face_as_array_vert_tri(BMFace *f, BMVert *r_verts[3]); void BM_face_as_array_vert_quad(BMFace *f, BMVert *r_verts[4]); diff --git a/source/blender/bmesh/operators/bmo_connect.c b/source/blender/bmesh/operators/bmo_connect.c index a6b0d9c522b..50588ad70a9 100644 --- a/source/blender/bmesh/operators/bmo_connect.c +++ b/source/blender/bmesh/operators/bmo_connect.c @@ -83,7 +83,7 @@ static int bm_face_connect_verts(BMesh *bm, BMFace *f) l_pair[1] = loops_split[0][0]; } - BM_face_legal_splits(bm, f, loops_split, STACK_SIZE(loops_split)); + BM_face_legal_splits(f, loops_split, STACK_SIZE(loops_split)); for (i = 0; i < STACK_SIZE(loops_split); i++) { BMVert **v_pair; diff --git a/source/blender/bmesh/operators/bmo_subdivide.c b/source/blender/bmesh/operators/bmo_subdivide.c index 96771e00291..6b55d5ea877 100644 --- a/source/blender/bmesh/operators/bmo_subdivide.c +++ b/source/blender/bmesh/operators/bmo_subdivide.c @@ -1112,7 +1112,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(bm, face, loops_split, BLI_array_count(loops_split)); +// BM_face_legal_splits(face, loops_split, BLI_array_count(loops_split)); for (j = 0; j < BLI_array_count(loops_split); j++) { if (loops_split[j][0]) { |