diff options
author | Ton Roosendaal <ton@blender.org> | 2009-07-09 18:35:40 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2009-07-09 18:35:40 +0400 |
commit | 77c61f545fb3248ae4e06afafa816764222405c4 (patch) | |
tree | ac7c351f3cc33bbaddf47c73df98490c5c2314b4 /source/blender/makesdna/DNA_windowmanager_types.h | |
parent | 4a3f56a29d64dfc38028f9216339d7aa390a1987 (diff) |
2.5
Bad bad DNA errors! People should really check on warning prints for
compiling dna dir...
- SpaceFile: ListBase* prev; <- dna doesnt recognize this
- wmEvent: const variables were not supported yet.
The first I fixed, 2nd I added support for in makesdna.
Note that files saved between tuesday july 7 and now can be corrupted!
Diffstat (limited to 'source/blender/makesdna/DNA_windowmanager_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_windowmanager_types.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h index b63fb35c193..fcf3d0aec23 100644 --- a/source/blender/makesdna/DNA_windowmanager_types.h +++ b/source/blender/makesdna/DNA_windowmanager_types.h @@ -217,11 +217,6 @@ typedef struct wmOperator { /* add this flag if the event should pass through */ #define OPERATOR_PASS_THROUGH 8 -typedef enum wmRadialControlMode { - WM_RADIALCONTROL_SIZE, - WM_RADIALCONTROL_STRENGTH, - WM_RADIALCONTROL_ANGLE -} wmRadialControlMode; /* ************** wmEvent ************************ */ /* for read-only rna access, dont save this */ @@ -244,15 +239,25 @@ typedef struct wmEvent { short shift, ctrl, alt, oskey; /* oskey is apple or windowskey, value denotes order of pressed */ short keymodifier; /* rawkey modifier */ + short pad1; + /* keymap item, set by handler (weak?) */ const char *keymap_idname; /* custom data */ - short custom; /* custom data type, stylus, 6dof, see wm_event_types.h */ - void *customdata; /* ascii, unicode, mouse coords, angles, vectors, dragdrop info */ + short custom; /* custom data type, stylus, 6dof, see wm_event_types.h */ short customdatafree; + int pad2; + void *customdata; /* ascii, unicode, mouse coords, angles, vectors, dragdrop info */ } wmEvent; +typedef enum wmRadialControlMode { + WM_RADIALCONTROL_SIZE, + WM_RADIALCONTROL_STRENGTH, + WM_RADIALCONTROL_ANGLE +} wmRadialControlMode; + + #endif /* DNA_WINDOWMANAGER_TYPES_H */ |