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

Check for deletion before moving vert in dyntopo collapse edge

Browse Source 
Fixes [#33964] Dyntopo crash with edge collapse + undo
projects.blender.org/tracker/?func=detail&aid=33964&group_id=9&atid=498
This commit is contained in:
Nicholas Bishop
2013-01-26 17:19:21 +00:00
parent 4245a107cf
commit 7e49a39acd
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/blenkernel/intern/pbvh_bmesh.c
View File

@@ -857,9 +857,12 @@ static void pbvh_bmesh_collapse_edge(PBVH *bvh, BMEdge *e, BMVert *v1,
}
}
/* Move v1 to the midpoint of v1 and v2 */
BM_log_vert_before_modified(bvh->bm, bvh->bm_log, v1);
mid_v3_v3v3(v1->co, v1->co, v2->co);
/* Move v1 to the midpoint of v1 and v2 (if v1 still exists, it
* may have been deleted above) */
if (!BLI_ghash_haskey(deleted_verts, v1)) {
BM_log_vert_before_modified(bvh->bm, bvh->bm_log, v1);
mid_v3_v3v3(v1->co, v1->co, v2->co);
}
/* Delete v2 */
BLI_assert(BM_vert_face_count(v2) == 0);