Merging r42413 through r42441 form trunk into soc-2011-tomato

4 files changed, 5 insertions, 19 deletions

diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h
index b7d9208e595..7d57e2c295c 100644
--- a/source/blender/makesdna/DNA_mesh_types.h
+++ b/source/blender/makesdna/DNA_mesh_types.h
@@ -48,7 +48,6 @@ struct MSticky;
 struct Mesh;
 struct OcInfo;
 struct Multires;
-struct PartialVisibility;
 struct EditMesh;
 struct AnimData;
 
@@ -100,7 +99,6 @@ typedef struct Mesh {
 	short totcol;
 
 	struct Multires *mr DNA_DEPRECATED; /* deprecated multiresolution modeling data, only keep for loading old files */
-	struct PartialVisibility *pv;
 } Mesh;
 
 /* deprecated by MTFace, only here for file reading */
diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h
index b6fc8106ba0..d772324cd72 100644
--- a/source/blender/makesdna/DNA_meshdata_types.h
+++ b/source/blender/makesdna/DNA_meshdata_types.h
@@ -174,14 +174,6 @@ typedef struct Multires {
 
 /** End Multires **/
 
-typedef struct PartialVisibility {
-	unsigned int *vert_map; /* vert_map[Old Index]= New Index */
-	int *edge_map; /* edge_map[Old Index]= New Index, -1= hidden */
-	MFace *old_faces;
-	MEdge *old_edges;
-	unsigned int totface, totedge, totvert, pad;
-} PartialVisibility;
-
 typedef struct MRecast{
 	int		i;
 } MRecast;
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index f5d327f50da..e4237197fca 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -135,7 +135,7 @@ typedef struct Object {
 
 	/* materials */
 	struct Material **mat;	/* material slots */
-	char *matbits;			/* 1 if material linked to object */
+	char *matbits;			/* a boolean field, with each byte 1 if corrusponding material is linked to object */
 	int totcol;				/* copy of mesh or curve or meta */
 	int actcol;				/* currently selected material in the UI */
 	
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 649b849ea5e..6bcea71b5e9 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -376,14 +376,11 @@ typedef struct SpaceTime {
 	float blockscale  DNA_DEPRECATED;
 	
 	View2D v2d  DNA_DEPRECATED; /* deprecated, copied to region */
-	
+
 	ListBase caches;
-	int cache_display, pad;
-	
-	int flag;
 
-	int redraws  DNA_DEPRECATED; /* redraws is deprecated... moved to screen */
-	
+	int cache_display;
+	int flag;
 } SpaceTime;
 
 typedef struct SpaceNode {
@@ -397,9 +394,8 @@ typedef struct SpaceNode {
 	View2D v2d  DNA_DEPRECATED; /* deprecated, copied to region */
 	
 	struct ID *id, *from;		/* context, no need to save in file? well... pinning... */
-	short flag, menunr;			/* menunr: browse id block in header */
+	short flag, pad1;			/* menunr: browse id block in header */
 	float aspect;
-	void *curfont;
 	
 	float xof, yof;		/* offset for drawing the backdrop */
 	float zoom, padf;	/* zoom for backdrop */