=bmesh= merge from trunk at r36153

1 files changed, 8 insertions, 12 deletions

diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h
index ec30a01c8e2..d505b22c773 100644
--- a/source/blender/makesdna/DNA_mesh_types.h
+++ b/source/blender/makesdna/DNA_mesh_types.h
@@ -63,8 +63,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;
@@ -104,22 +102,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;
@@ -145,7 +141,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 */
@@ -160,7 +156,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)