diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-04-11 19:24:13 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-11 19:24:13 +0400 |
commit | 1f6369fd41c8821d876b7fe0d717655b2d89c319 (patch) | |
tree | eb86eeba81fa574c7729804801bb9d3238138949 /source/blender/makesdna/DNA_key_types.h | |
parent | e7b7bc12725032a82740a752026e396c8d25a5a9 (diff) |
bmesh shape key conversion on exiting editmode.
there were 2 blocks of code (both calculating the offset array), now move the fallback method into the main key conversions block.
Diffstat (limited to 'source/blender/makesdna/DNA_key_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_key_types.h | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/source/blender/makesdna/DNA_key_types.h b/source/blender/makesdna/DNA_key_types.h index 611f4c2a25f..85d8b9bec7e 100644 --- a/source/blender/makesdna/DNA_key_types.h +++ b/source/blender/makesdna/DNA_key_types.h @@ -83,20 +83,28 @@ typedef struct Key { /* **************** KEY ********************* */ /* key->type */ -#define KEY_NORMAL 0 -#define KEY_RELATIVE 1 +enum { + KEY_NORMAL = 0, + KEY_RELATIVE = 1 +}; /* key->flag */ -#define KEY_DS_EXPAND 1 +enum { + KEY_DS_EXPAND = 1 +}; /* keyblock->type */ -#define KEY_LINEAR 0 -#define KEY_CARDINAL 1 -#define KEY_BSPLINE 2 +enum { + KEY_LINEAR = 0, + KEY_CARDINAL = 1, + KEY_BSPLINE = 2 +}; /* keyblock->flag */ -#define KEYBLOCK_MUTE (1<<0) -#define KEYBLOCK_SEL (1<<1) -#define KEYBLOCK_LOCKED (1<<2) -#define KEYBLOCK_MISSING (1<<3) /*temporary flag*/ -#endif +enum { + KEYBLOCK_MUTE = (1 << 0), + KEYBLOCK_SEL = (1 << 1), + KEYBLOCK_LOCKED = (1 << 2) +}; + +#endif /* __DNA_KEY_TYPES_H__ */ |