manually copy more changes from trunk.

6 files changed, 7 insertions, 14 deletions

diff --git a/source/blender/makesdna/DNA_color_types.h b/source/blender/makesdna/DNA_color_types.h
index 8a556c4b87a..3b5a1865832 100644
--- a/source/blender/makesdna/DNA_color_types.h
+++ b/source/blender/makesdna/DNA_color_types.h
@@ -51,8 +51,6 @@ typedef struct CurveMapPoint {
 #define CUMA_SELECT		1
 #define CUMA_VECTOR		2
 
-struct CurveMapPoint;
-
 typedef struct CurveMap {
 	short totpoint, flag;
 	
diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h
index eec2c8259ef..0760ba0542f 100644
--- a/source/blender/makesdna/DNA_customdata_types.h
+++ b/source/blender/makesdna/DNA_customdata_types.h
@@ -76,20 +76,20 @@ typedef struct CustomData {
 #define CD_MFACE		4
 #define CD_MTFACE		5
 #define CD_MCOL			6
-#define CD_ORIGINDEX		7
+#define CD_ORIGINDEX	7
 #define CD_NORMAL		8
 #define CD_FLAGS		9
 #define CD_PROP_FLT		10
 #define CD_PROP_INT		11
 #define CD_PROP_STR		12
-#define CD_ORIGSPACE		13 /* for modifier stack face location mapping */
+#define CD_ORIGSPACE	13 /* for modifier stack face location mapping */
 #define CD_ORCO			14
 #define CD_MTEXPOLY		15
 #define CD_MLOOPUV		16
 #define CD_MLOOPCOL		17
 #define CD_TANGENT		18
 #define CD_MDISPS		19
-#define CD_WEIGHT_MCOL		20 /* for displaying weightpaint colors */
+#define CD_WEIGHT_MCOL	20 /* for displaying weightpaint colors */
 #define CD_MPOLY		21
 #define CD_MLOOP		22
 #define CD_CLOTH_ORCO	23
diff --git a/source/blender/makesdna/DNA_key_types.h b/source/blender/makesdna/DNA_key_types.h
index 71b631e3d5e..6bdd63f8483 100644
--- a/source/blender/makesdna/DNA_key_types.h
+++ b/source/blender/makesdna/DNA_key_types.h
@@ -45,7 +45,7 @@ typedef struct KeyBlock {
 	float pos;
 	float curval;
 	short type, adrcode, relative, flag;	/* relative == 0 means first key is reference */
-	int totelem, pad;
+	int totelem, pad2;
 	
 	void *data;
 	float *weights;
@@ -55,7 +55,7 @@ typedef struct KeyBlock {
 	float slidermin;
 	float slidermax;
 
-	int uid, pad2;
+	int uid, pad3;
 } KeyBlock;
 
 
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 90eafe82395..e4b37feb7ca 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -131,7 +131,7 @@ typedef struct Object {
 
 	/* materials */
 	struct Material **mat;	/* material slots */
-	char *matbits;	/* a boolean field, with each byte 1 if corrusponding material is 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 */
 	
@@ -413,7 +413,6 @@ extern Object workob;
 #define OB_BOUND_POLYT		5
 /* #define OB_BOUND_DYN_MESH   6 */ /*UNUSED*/
 #define OB_BOUND_CAPSULE	7
-#define OB_BOUND_CAPSULE	7
 
 
 /* **************** BASE ********************* */
@@ -434,7 +433,7 @@ extern Object workob;
 
 
 /* an initial attempt as making selection more specific! */
-#define BA_DESELECT	0
+#define BA_DESELECT		0
 #define BA_SELECT		1
 
 
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index b36ae468f6a..1d4ee2a30b3 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -236,9 +236,6 @@ typedef struct ThemeSpace {
 	char hpad[7];
 	
 	char preview_back[4];
-
-	char pin[4];
-	int pin_opac;
 	
 } ThemeSpace;
 
diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h
index 623a0fc1038..31e59f18626 100644
--- a/source/blender/makesdna/DNA_windowmanager_types.h
+++ b/source/blender/makesdna/DNA_windowmanager_types.h
@@ -194,7 +194,6 @@ typedef struct wmWindow {
 	
 	ListBase subwindows;	/* opengl stuff for sub windows, see notes in wm_subwindow.c */
 	ListBase gesture;		/* gesture stuff */
-	double lasttime;
 } wmWindow;
 
 /* should be somthing like DNA_EXCLUDE