[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45539] trunk/blender/source/blender: write mesh selection history to the blend file.

[Campbell Barton]

Revision: 45539
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45539
Author:   campbellbarton
Date:     2012-04-11 11:52:21 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
write mesh selection history to the blend file. without this active edge/vert are lost on UNDO.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/blenloader/intern/writefile.c
    trunk/blender/source/blender/makesdna/DNA_mesh_types.h

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2012-04-11 11:22:19 UTC (rev 45538)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2012-04-11 11:52:21 UTC (rev 45539)
@@ -3838,6 +3838,7 @@
 	mesh->mloopcol= newdataadr(fd, mesh->mloopcol);
 	mesh->mloopuv= newdataadr(fd, mesh->mloopuv);
 	mesh->mtpoly= newdataadr(fd, mesh->mtpoly);
+	mesh->mselect = newdataadr(fd, mesh->mselect);
 
 	/* animdata */
 	mesh->adt= newdataadr(fd, mesh->adt);
@@ -3884,7 +3885,6 @@
 
 
 	mesh->bb= NULL;
-	mesh->mselect = NULL;
 	mesh->edit_btmesh= NULL;
 	
 	/* Multires data */

Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c	2012-04-11 11:22:19 UTC (rev 45538)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c	2012-04-11 11:52:21 UTC (rev 45539)
@@ -1728,6 +1728,7 @@
 				if (mesh->adt) write_animdata(wd, mesh->adt);
 
 				writedata(wd, DATA, sizeof(void *)*mesh->totcol, mesh->mat);
+				writedata(wd, DATA, sizeof(MSelect) * mesh->totselect, mesh->mselect);
 
 				write_customdata(wd, &mesh->id, mesh->totvert, &mesh->vdata, -1, 0);
 				write_customdata(wd, &mesh->id, mesh->totedge, &mesh->edata, -1, 0);
@@ -1793,6 +1794,7 @@
 				if (mesh->adt) write_animdata(wd, mesh->adt);
 
 				writedata(wd, DATA, sizeof(void *)*mesh->totcol, mesh->mat);
+				/* writedata(wd, DATA, sizeof(MSelect) * mesh->totselect, mesh->mselect); */ /* pre-bmesh NULL's */
 
 				write_customdata(wd, &mesh->id, mesh->totvert, &mesh->vdata, -1, 0);
 				write_customdata(wd, &mesh->id, mesh->totedge, &mesh->edata, -1, 0);

Modified: trunk/blender/source/blender/makesdna/DNA_mesh_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_mesh_types.h	2012-04-11 11:22:19 UTC (rev 45538)
+++ trunk/blender/source/blender/makesdna/DNA_mesh_types.h	2012-04-11 11:52:21 UTC (rev 45539)
@@ -67,6 +67,7 @@
 	struct Ipo *ipo  DNA_DEPRECATED;  /* old animation system, deprecated for 2.5 */
 	struct Key *key;
 	struct Material **mat;
+	struct MSelect *mselect;
 
 /* BMESH ONLY */
 	/*new face structures*/
@@ -91,7 +92,6 @@
 	struct MCol *mcol;		
 	struct MSticky *msticky;
 	struct Mesh *texcomesh;
-	struct MSelect *mselect;
 	
 	struct BMEditMesh *edit_btmesh;	/* not saved in file! */