blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix T37559: Crash dissolving vertices in some situations

This commit is contained in:
Campbell Barton 2013-11-22 19:42:14 +11:00
parent d4a11388bf
commit 283f43d31a
Notes: blender-bot 2023-02-14 11:34:32 +01:00 
Referenced by issue #37559, Blender crashes when dissolving vertices in some situations
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/bmesh/operators/bmo_dissolve.c
View File

@ -440,13 +440,18 @@ void bmo_dissolve_verts_exec(BMesh *bm, BMOperator *op)
BMO_error_raise(bm, op, BMERR_DISSOLVEVERTS_FAILED, msg);
}
/* clean up any remainin */
BM_ITER_MESH_MUTABLE (v, v_next, &iter, bm, BM_VERTS_OF_MESH) {
/* clean up any remaining */
/* note: don't use BM_ITER_MESH_MUTABLE here, even though vertices are removed (T37559) */
BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
if (BMO_elem_flag_test(bm, v, VERT_MARK)) {
if (!BM_vert_dissolve(bm, v)) {
BMO_error_raise(bm, op, BMERR_DISSOLVEVERTS_FAILED, NULL);
return;
}
#ifdef DEBUG
/* workaround debug assert */
iter.count = bm->totvert;
#endif
}
}