archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T48667: Bisect-fill crash

Browse Source 
BMO iterator would loop over removed faces.

Recent changes to mempool FREEWORD size exposed this bug.
This commit is contained in:
Campbell Barton
2016-06-17 21:45:56 +10:00
parent ca01fe58e1
commit bcde045b32
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
source/blender/bmesh/operators/bmo_triangulate.c
View File

@@ -244,29 +244,33 @@ void bmo_triangle_fill_exec(BMesh *bm, BMOperator *op)
BMO_slot_buffer_flag_enable(bm, bmop.slots_out, "geom.out", BM_FACE | BM_EDGE, ELE_NEW);
BMO_op_finish(bm, &bmop);
}
BMO_slot_buffer_from_enabled_flag(bm, op, op->slots_out, "geom.out", BM_EDGE | BM_FACE, ELE_NEW);
if (use_dissolve) {
BMO_ITER (e, &siter, op->slots_out, "geom.out", BM_EDGE) {
if (LIKELY(e->l)) { /* in rare cases the edges face will have already been removed from the edge */
BMFace *f_new;
f_new = BM_faces_join_pair(bm, e->l->f,
e->l->radial_next->f, e,
false); /* join faces */
if (f_new) {
BMO_elem_flag_enable(bm, f_new, ELE_NEW);
BM_edge_kill(bm, e);
BMEdge *e_next;
BMIter iter;
BM_ITER_MESH_MUTABLE (e, e_next, &iter, bm, BM_EDGES_OF_MESH) {
if (BMO_elem_flag_test(bm, e, ELE_NEW)) {
/* in rare cases the edges face will have already been removed from the edge */
if (LIKELY(e->l)) {
BMFace *f_new = BM_faces_join_pair(
bm, e->l->f,
e->l->radial_next->f, e,
false); /* join faces */
if (f_new) {
BMO_elem_flag_enable(bm, f_new, ELE_NEW);
BM_edge_kill(bm, e);
}
else {
BMO_error_clear(bm);
}
}
else {
BMO_error_clear(bm);
BM_edge_kill(bm, e);
}
}
else {
BM_edge_kill(bm, e);
}
}
BMO_slot_buffer_from_enabled_flag(bm, op, op->slots_out, "geom.out", BM_EDGE | BM_FACE, ELE_NEW);
}
BMO_slot_buffer_from_enabled_flag(bm, op, op->slots_out, "geom.out", BM_EDGE | BM_FACE, ELE_NEW);
}