tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

bmesh: fix own bug in BM_vert_collapse_faces() with option 'kill_degenerate_faces', was removing data as it iterated, would crash in some cases.

This commit is contained in:
Campbell Barton 2012-04-18 07:27:15 +00:00
parent 1f01d62d15
commit 9a4aecbcc3
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/bmesh/intern/bmesh_mods.c
View File

@ -545,17 +545,27 @@ BMEdge *BM_vert_collapse_faces(BMesh *bm, BMEdge *ke, BMVert *kv, float fac,
/* ne = BM_edge_exists(tv, tv2); */ /* same as return above */
if (kill_degenerate_faces) {
BLI_array_declare(bad_faces);
BMFace **bad_faces = NULL;
BMIter fiter;
BMFace *f;
BMVert *verts[2] = {ne->v1, ne->v2};
int i;
for (i = 0; i < 2; i++) {
/* cant kill data we loop on, build a list and remove those */
BLI_array_empty(bad_faces);
BM_ITER(f, &fiter, bm, BM_FACES_OF_VERT, verts[i]) {
if (f->len < 3) {
BM_face_kill(bm, f);
BLI_array_append(bad_faces, f);
}
}
while ((f = BLI_array_pop(bad_faces))) {
BM_face_kill(bm, f);
}
}
BLI_array_free(bad_faces);
}
}