[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57888] trunk/blender/source/blender: fix [#35914] Blender crashes when trying to use vertex selection masking on a copy directly after using SHIFT+d

[Campbell Barton]

Revision: 57888
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57888
Author:   campbellbarton
Date:     2013-06-30 22:04:03 +0000 (Sun, 30 Jun 2013)
Log Message:
-----------
fix [#35914] Blender crashes when trying to use vertex selection masking on a copy directly after using SHIFT+d

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/mesh.c
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c	2013-06-30 21:41:06 UTC (rev 57887)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c	2013-06-30 22:04:03 UTC (rev 57888)
@@ -517,9 +517,9 @@
 		}
 	}
 
-	men->mselect = NULL;
 	men->edit_btmesh = NULL;
 
+	men->mselect = MEM_dupallocN(men->mselect);
 	men->bb = MEM_dupallocN(men->bb);
 	
 	men->key = BKE_key_copy(me->key);
@@ -3938,10 +3938,7 @@
 {
 	BLI_assert(ELEM3(type, ME_VSEL, ME_ESEL, ME_FSEL));
 
-	/* XXX how can it be that sometimes me->mselect is NULL here ? 
-	   It happens, but its not clear why it happens! 
-	*/
-	if (me->totselect && me->mselect) {
+	if (me->totselect) {
 		if (me->mselect[me->totselect - 1].type == type) {
 			return me->mselect[me->totselect - 1].index;
 		}

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2013-06-30 21:41:06 UTC (rev 57887)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2013-06-30 22:04:03 UTC (rev 57888)
@@ -4148,6 +4148,11 @@
 	mesh->bb = NULL;
 	mesh->edit_btmesh = NULL;
 	
+	/* happens with old files */
+	if (mesh->mselect == NULL) {
+		mesh->totselect = 0;
+	}
+
 	/* Multires data */
 	mesh->mr= newdataadr(fd, mesh->mr);
 	if (mesh->mr) {