From 91769a65f27b0b23fd39edbe7272ee48d0daf5b2 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 4 Apr 2011 04:47:18 +0000
Subject: [PATCH] remove unused DNA from mesh, effects list & cubemap size.

---
 source/blender/blenloader/intern/readfile.c |  7 -------
 source/blender/makesdna/DNA_mesh_types.h    | 20 ++++++++------------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 375190a0e7b..a8d5968984f 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6941,13 +6941,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 			sc= sc->id.next;
 		}
 	}
-	if(main->versionfile <= 112) {
-		Mesh *me = main->mesh.first;
-		while(me) {
-			me->cubemapsize= 1.0;
-			me= me->id.next;
-		}
-	}
 	if(main->versionfile <= 113) {
 		Material *ma = main->mat.first;
 		while(ma) {
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h
index bd2a6a996b5..ae7f5e65316 100644
--- a/source/blender/makesdna/DNA_mesh_types.h
+++ b/source/blender/makesdna/DNA_mesh_types.h
@@ -58,8 +58,6 @@ typedef struct Mesh {
 	struct AnimData *adt;		/* animation data (must be immediately after id for utilities to use it) */
 
 	struct BoundBox *bb;
-
-	ListBase effect;
 	
 	struct Ipo *ipo;		// XXX depreceated... old animation system
 	struct Key *key;
@@ -87,22 +85,20 @@ typedef struct Mesh {
 	 * of the last selected face and is similar to the old active face flag where
 	 * the face does not need to be selected, -1 is inactive */
 	int act_face; 
-	
-	short texflag, editflag;
-	
+
 	/* texture space, copied as one block in editobject.c */
 	float loc[3];
 	float size[3];
 	float rot[3];
-	
-	float cubemapsize;
-	
-	int drawflag;
+
+	short texflag, drawflag;
 	short smoothresh, flag;
 
 	short subdiv, subdivr;
+	char subsurftype;		/* only kept for backwards compat, not used anymore */
+	char editflag;
+
 	short totcol;
-	short subsurftype;		/* only kept for backwards compat, not used anymore */
 
 	struct Multires *mr;		/* Multiresolution modeling data */
 	struct PartialVisibility *pv;
@@ -128,7 +124,7 @@ typedef struct TFace {
 #define ME_EDIT_MIRROR_Z (1 << 2) // unused so far
 
 #define ME_EDIT_PAINT_MASK (1 << 3)
-#define ME_EDIT_MIRROR_TOPO (1 << 4) // unused so far
+#define ME_EDIT_MIRROR_TOPO (1 << 4)
 
 
 /* me->flag */
@@ -143,7 +139,7 @@ typedef struct TFace {
 #define ME_OPT_EDGES	256
 #define ME_DS_EXPAND	512
 
-/* me->drawflag, int */ 
+/* me->drawflag, short */
 #define ME_DRAWEDGES	(1 << 0)
 #define ME_DRAWFACES	(1 << 1)
 #define ME_DRAWNORMALS	(1 << 2)