[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54109] trunk/blender/source/blender/ blenkernel/intern/pbvh_bmesh.c: Check for deletion before moving vert in dyntopo collapse edge

[Nicholas Bishop]

Revision: 54109
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54109
Author:   nicholasbishop
Date:     2013-01-26 17:19:21 +0000 (Sat, 26 Jan 2013)
Log Message:
-----------
Check for deletion before moving vert in dyntopo collapse edge

Fixes [#33964] Dyntopo crash with edge collapse + undo
projects.blender.org/tracker/?func=detail&aid=33964&group_id=9&atid=498

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c

Modified: trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c	2013-01-26 12:30:44 UTC (rev 54108)
+++ trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c	2013-01-26 17:19:21 UTC (rev 54109)
@@ -857,9 +857,12 @@
 		}
 	}
 
-	/* 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);