diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-17 06:06:49 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-17 06:06:49 +0300 |
| commit | 0ffa64a45f7d961cb079a56629bcff105c81eb56 (patch) | |
| tree | 238bdd23687e6b54c1f75a35e5497837e8662bea /source/blender/makesdna/DNA_action_types.h | |
| parent | dd91d7d09d9994bc20bdbfb501d5101044ac99c8 (diff) | |
| parent | 99520e3f92e14eb3b7fab3f7decd0914a3da1360 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/DNA_action_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_action_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index 7809d2d1c4a..cc8e9a18655 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -765,7 +765,7 @@ typedef struct bActionChannel { } bActionChannel; /* Action Channel flags (ONLY USED FOR DO_VERSIONS...) */ -typedef enum ACHAN_FLAG { +typedef enum eActionChannelFlag { ACHAN_SELECTED = (1 << 0), ACHAN_HIGHLIGHTED = (1 << 1), ACHAN_HIDDEN = (1 << 2), @@ -774,6 +774,6 @@ typedef enum ACHAN_FLAG { ACHAN_SHOWIPO = (1 << 5), ACHAN_SHOWCONS = (1 << 6), ACHAN_MOVED = (1u << 31) -} ACHAN_FLAG; +} eActionChannelFlag; #endif /* __DNA_ACTION_TYPES_H__ */ |