Revision: 40762
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40762
Author: campbellbarton
Date: 2011-10-03 01:36:25 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
Change struct alignment for structs which are intended to be aligned but aren't.
remove uiIconImage too since its unused.
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface_intern.h
trunk/blender/source/blender/makesrna/RNA_types.h
trunk/blender/source/blender/windowmanager/WM_types.h
Modified: trunk/blender/source/blender/editors/interface/interface_intern.h
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_intern.h
2011-10-03 01:01:01 UTC (rev 40761)
+++ trunk/blender/source/blender/editors/interface/interface_intern.h
2011-10-03 01:36:25 UTC (rev 40762)
@@ -136,19 +136,10 @@
/* 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 @@
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 @@
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 @@
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 @@
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 @@
/* for operator popups */
struct wmOperatorType *optype;
- int opcontext;
ScrArea *ctx_area;
ARegion *ctx_region;
+ int opcontext;
/* return values */
int butretval;
Modified: trunk/blender/source/blender/makesrna/RNA_types.h
===================================================================
--- trunk/blender/source/blender/makesrna/RNA_types.h 2011-10-03 01:01:01 UTC
(rev 40761)
+++ trunk/blender/source/blender/makesrna/RNA_types.h 2011-10-03 01:36:25 UTC
(rev 40762)
@@ -230,8 +230,8 @@
int level;
/* external */
+ PointerRNA ptr;
int valid;
- PointerRNA ptr;
} CollectionPropertyIterator;
typedef struct CollectionPointerLink {
@@ -274,13 +274,13 @@
/* 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 {
Modified: trunk/blender/source/blender/windowmanager/WM_types.h
===================================================================
--- trunk/blender/source/blender/windowmanager/WM_types.h 2011-10-03
01:01:01 UTC (rev 40761)
+++ trunk/blender/source/blender/windowmanager/WM_types.h 2011-10-03
01:36:25 UTC (rev 40762)
@@ -464,8 +464,6 @@
/* struct wmOperatorTypeMacro */
ListBase macro;
- short flag;
-
/* pointer to modal keymap, do not free! */
struct wmKeyMap *modalkeymap;
@@ -476,6 +474,10 @@
/* RNA integration */
ExtensionRNA ext;
+
+ /* Flag last for padding */
+ short flag;
+
} wmOperatorType;
/* **************** Paint Cursor ******************* */
@@ -540,11 +542,12 @@
/* 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? ************** */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
