Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-10-03 05:36:25 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-10-03 05:36:25 +0400
commitb001eeb10deed53ea763f39de718b3558f5f0326 (patch)
treeea2b104385891c754411ffb185ccaafdc628624e /source/blender/windowmanager
parentf87ab2e907823754685bb22d45c62c2734721fa4 (diff)
Change struct alignment for structs which are intended to be aligned but aren't.
remove uiIconImage too since its unused.
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r--source/blender/windowmanager/WM_types.h13
1 files changed, 8 insertions, 5 deletions
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? ************** */