diff options
Diffstat (limited to 'source/blender/bmesh')
| -rw-r--r-- | source/blender/bmesh/bmesh_queries.h | 3 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_construct.c | 4 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_queries.c | 17 | ||||
| -rw-r--r-- | source/blender/bmesh/operators/bmo_create.c | 6 |
4 files changed, 20 insertions, 10 deletions
diff --git a/source/blender/bmesh/bmesh_queries.h b/source/blender/bmesh/bmesh_queries.h index b4fb6259686..1ef0c469a60 100644 --- a/source/blender/bmesh/bmesh_queries.h +++ b/source/blender/bmesh/bmesh_queries.h @@ -95,7 +95,8 @@ float BM_edge_face_angle(struct BMesh *bm, struct BMEdge *e); float BM_vert_edge_angle(struct BMesh *bm, struct BMVert *v); /* checks overlapping of existing faces with the verts in varr. */ -int BM_face_exists_overlap(struct BMesh *bm, struct BMVert **varr, int len, struct BMFace **existface); +int BM_face_exists_overlap(struct BMesh *bm, struct BMVert **varr, int len, struct BMFace **r_existface, + const short do_partial); /* checks if many existing faces overlap the faces defined by varr */ int BM_face_exists_multi(BMesh *bm, struct BMVert **varr, struct BMEdge **earr, int len); diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c index c91bd83ed0e..3346bded0e5 100644 --- a/source/blender/bmesh/intern/bmesh_construct.c +++ b/source/blender/bmesh/intern/bmesh_construct.c @@ -93,10 +93,10 @@ BMFace *BM_face_create_quad_tri_v(BMesh *bm, BMVert **verts, int len, const BMFa if (nodouble) { /* check if face exists or overlaps */ if (len == 4) { - overlap = BM_face_exists_overlap(bm, verts, len, &f); + overlap = BM_face_exists_overlap(bm, verts, len, &f, FALSE); } else { - overlap = BM_face_exists_overlap(bm, verts, len, &f); + overlap = BM_face_exists_overlap(bm, verts, len, &f, FALSE); } } diff --git a/source/blender/bmesh/intern/bmesh_queries.c b/source/blender/bmesh/intern/bmesh_queries.c index 957473ab55c..65f2d2df786 100644 --- a/source/blender/bmesh/intern/bmesh_queries.c +++ b/source/blender/bmesh/intern/bmesh_queries.c @@ -642,26 +642,31 @@ float BM_vert_edge_angle(BMesh *UNUSED(bm), BMVert *v) * * */ - -int BM_face_exists_overlap(BMesh *bm, BMVert **varr, int len, BMFace **overlapface) +int BM_face_exists_overlap(BMesh *bm, BMVert **varr, int len, BMFace **r_overlapface, + const short do_partial) { BMIter vertfaces; BMFace *f; int i, amount; - if (overlapface) *overlapface = NULL; - for (i = 0; i < len; i++) { f = BM_iter_new(&vertfaces, bm, BM_FACES_OF_VERT, varr[i]); while (f) { amount = BM_verts_in_face(bm, f, varr, len); - if (amount >= len) { - if (overlapface) *overlapface = f; + if ((amount >= len) && (do_partial == TRUE || len == f->len)) { + if (r_overlapface) { + *r_overlapface = f; + } return TRUE; } f = BM_iter_step(&vertfaces); } } + + if (r_overlapface) { + *r_overlapface = NULL; + } + return FALSE; } diff --git a/source/blender/bmesh/operators/bmo_create.c b/source/blender/bmesh/operators/bmo_create.c index 2b9f530e77d..9136eccb6a7 100644 --- a/source/blender/bmesh/operators/bmo_create.c +++ b/source/blender/bmesh/operators/bmo_create.c @@ -1386,7 +1386,11 @@ void bmesh_contextual_create_exec(BMesh *bm, BMOperator *op) } else if (amount == 3) { /* create triangl */ - BM_face_create_quad_tri(bm, verts[0], verts[1], verts[2], NULL, NULL, TRUE); + f = BM_face_create_quad_tri(bm, verts[0], verts[1], verts[2], NULL, NULL, TRUE); + + if (f) { + BMO_elem_flag_enable(bm, f, ELE_OUT); + } } else if (amount == 4) { f = NULL; |