diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-10-03 11:06:56 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-10-03 11:06:56 +0400 |
| commit | 5b5bc633960727279ebeaad2d1a48093f71c3984 (patch) | |
| tree | 872f25987963d38ecbcf509b55ed662bb6503844 /source/blender/bmesh/operators/bmo_join_triangles.c | |
| parent | 4cb4dc8432922413e40e0b8b93dc06e5710693de (diff) | |
fix [#36923] Merge / Delete vertices crashes for some meshes
add BM_ITER_MESH_MUTABLE which steps before entering the for() loop body and prevents the assert from complaining about removing mesh data while iterating as well as the crash.
this was done in quite a few areas, more may turn up.
Diffstat (limited to 'source/blender/bmesh/operators/bmo_join_triangles.c')
| -rw-r--r-- | source/blender/bmesh/operators/bmo_join_triangles.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/bmesh/operators/bmo_join_triangles.c b/source/blender/bmesh/operators/bmo_join_triangles.c index 6d4f257909c..76678bfa4f7 100644 --- a/source/blender/bmesh/operators/bmo_join_triangles.c +++ b/source/blender/bmesh/operators/bmo_join_triangles.c @@ -203,7 +203,7 @@ void bmo_join_triangles_exec(BMesh *bm, BMOperator *op) BMIter iter; BMOIter siter; BMFace *f; - BMEdge *e; + BMEdge *e, *e_next; /* data: edge-to-join, sort_value: error weight */ struct SortPointerByFloat *jedges; unsigned i, totedge; @@ -291,7 +291,7 @@ void bmo_join_triangles_exec(BMesh *bm, BMOperator *op) MEM_freeN(jedges); /* join best weighted */ - BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) { + BM_ITER_MESH_MUTABLE (e, e_next, &iter, bm, BM_EDGES_OF_MESH) { BMFace *f_new; BMFace *f_a, *f_b; |