Change struct alignment for structs which are intended to be aligned but aren't.

remove uiIconImage too since its unused.

3 files changed, 22 insertions, 29 deletions

diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index 07ff8699b60..6fb7677da6e 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -136,19 +136,10 @@ typedef enum {
 /* for scope resize zone */
 #define SCOPE_RESIZE_PAD	9
 
-typedef struct {
-	short xim, yim;
-	unsigned int *rect;
-	short xofs, yofs;
-} uiIconImage;
-
-
 typedef struct uiLinkLine {				/* only for draw/edit */
 	struct uiLinkLine *next, *prev;
-
+	struct uiBut *from, *to;
 	short flag, pad;
-	
-	struct uiBut *from, *to;	
 } uiLinkLine;
 
 typedef struct {
@@ -164,10 +155,10 @@ typedef struct {
 
 struct uiBut {
 	struct uiBut *next, *prev;
-	short type, pointype, bit, bitnr, retval, strwidth, ofs, pos, selsta, selend;
-	short alignnr;
 	int flag;
-	
+	short type, pointype, bit, bitnr, retval, strwidth, ofs, pos, selsta, selend, alignnr;
+	short pad1;
+
 	char *str;
 	char strdata[UI_MAX_NAME_STR];
 	char drawstr[UI_MAX_DRAW_STR];
@@ -282,7 +273,7 @@ struct uiBlock {
 	float minx, miny, maxx, maxy;
 	float aspect;
 
-	short alignnr;
+	int puphash;				// popup menu hash for memory
 
 	uiButHandleFunc func;
 	void *func_arg1;
@@ -306,10 +297,12 @@ struct uiBlock {
 	void *drawextra_arg2;
 
 	int flag;
+	short alignnr;
+
 	char direction;
 	char dt; /* drawtype: UI_EMBOSS, UI_EMBOSSN ... etc, copied to buttons */
-	char pad;
 	char auto_open;
+	char _pad[7];
 	double auto_open_last;
 
 	const char *lockstr;
@@ -327,15 +320,12 @@ struct uiBlock {
 	ListBase saferct;			// uiSafetyRct list
 
 	uiPopupBlockHandle *handle;	// handle
-
-	int puphash;				// popup menu hash for memory
 	
 	void *evil_C;				// XXX hack for dynamic operator enums
 
+	struct UnitSettings *unit;	// unit system, used a lot for numeric buttons so include here rather then fetching through the scene every time.
 	float _hsv[3];				// XXX, only access via ui_block_hsv_get()
 	char color_profile;			// color profile for correcting linear colors for display
-	struct UnitSettings *unit;	// unit system, used a lot for numeric buttons so include here rather then fetching through the scene every time.
-
 };
 
 typedef struct uiSafetyRct {
@@ -401,9 +391,9 @@ struct uiPopupBlockHandle {
 
 	/* for operator popups */
 	struct wmOperatorType *optype;
-	int opcontext;
 	ScrArea *ctx_area;
 	ARegion *ctx_region;
+	int opcontext;
 	
 	/* return values */
 	int butretval;
diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h
index 8e8a2133b89..4e1177996ef 100644
--- a/source/blender/makesrna/RNA_types.h
+++ b/source/blender/makesrna/RNA_types.h
@@ -230,8 +230,8 @@ typedef struct CollectionPropertyIterator {
 	int level;
 
 	/* external */
-	int valid;
 	PointerRNA ptr;
+	int valid;
 } CollectionPropertyIterator;
 
 typedef struct CollectionPointerLink {
@@ -274,13 +274,13 @@ typedef struct ParameterList {
 	/* storage for parameters */
 	void *data;
 
+	/* function passed at creation time */
+	struct FunctionRNA *func;
+
 	/* store the parameter size */
 	int alloc_size;
 
 	int arg_count, ret_count;
-
-	/* function passed at creation time */
-	struct FunctionRNA *func;
 } ParameterList;
 
 typedef struct ParameterIterator {
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index cc3ae3ab753..fec59e97194 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -464,8 +464,6 @@ typedef struct wmOperatorType {
 	/* struct wmOperatorTypeMacro */
 	ListBase macro;
 
-	short flag;
-
 	/* pointer to modal keymap, do not free! */
 	struct wmKeyMap *modalkeymap;
 
@@ -476,6 +474,10 @@ typedef struct wmOperatorType {
 
 	/* RNA integration */
 	ExtensionRNA ext;
+
+	/* Flag last for padding */
+	short flag;
+
 } wmOperatorType;
 
 /* **************** Paint Cursor ******************* */
@@ -540,11 +542,12 @@ typedef struct wmDropBox {
 	
 	/* if poll survives, operator is called */
 	wmOperatorType *ot;				/* not saved in file, so can be pointer */
-	short opcontext;				/* default invoke */
-	
-	struct IDProperty *properties;			/* operator properties, assigned to ptr->data and can be written to a file */
+
+	struct IDProperty *properties;	/* operator properties, assigned to ptr->data and can be written to a file */
 	struct PointerRNA *ptr;			/* rna pointer to access properties */
 
+	short opcontext;				/* default invoke */
+
 } wmDropBox;
 
 /* *************** migrated stuff, clean later? ************** */