griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

correct error in own recent edits to triangle joining

Browse Source
This commit is contained in:
Campbell Barton
2013-08-02 13:35:04 +00:00
parent efe690a3a5
commit c17f5960df
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/bmesh/operators/bmo_join_triangles.c
View File

@@ -220,14 +220,15 @@ void bmo_join_triangles_exec(BMesh *bm, BMOperator *op)
/* flag all edges of all input face */
BMO_ITER (f, &siter, op->slots_in, "faces", BM_FACE) {
BMO_elem_flag_enable(bm, f, FACE_INPUT);
if (f->len == 3) {
BMO_elem_flag_enable(bm, f, FACE_INPUT);
}
}
/* flag edges surrounded by 2 flagged triangles */
BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
BMFace *f_a, *f_b;
if (BM_edge_face_pair(e, &f_a, &f_b) &&
(f_a->len == 3 && f_b->len == 3) &&
(BMO_elem_flag_test(bm, f_a, FACE_INPUT) && BMO_elem_flag_test(bm, f_b, FACE_INPUT)))
{
BMO_elem_flag_enable(bm, e, EDGE_MARK);
@@ -307,9 +308,11 @@ void bmo_join_triangles_exec(BMesh *bm, BMOperator *op)
continue;
BM_edge_face_pair(e, &f_a, &f_b); /* checked above */
f_new = BM_faces_join_pair(bm, f_a, f_b, e, true);
if (f_new) {
BMO_elem_flag_enable(bm, f_new, FACE_OUT);
if ((f_a->len == 3 && f_b->len == 3)) {
f_new = BM_faces_join_pair(bm, f_a, f_b, e, true);
if (f_new) {
BMO_elem_flag_enable(bm, f_new, FACE_OUT);
}
}
}