diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2017-01-17 22:01:59 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2017-01-17 22:01:59 +0300 |
commit | 3216831c7638c84600323ff17d5c881400900c7b (patch) | |
tree | 979471adc344c5a654a06c604e4d7ae0c9fc02ca /source/blender/editors/include/ED_anim_api.h | |
parent | 3df30c34c3d6f4d5cd63bbdbf8f943aea3998f5b (diff) |
T50457 Remove temporary solution for animation types and put in definitve position
After revert the commit rB4b99958ca12642, the line added at the end of the enum is not necessary anymore because it is replaced by the corresponding element in the list in the right position.
Diffstat (limited to 'source/blender/editors/include/ED_anim_api.h')
-rw-r--r-- | source/blender/editors/include/ED_anim_api.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index 67eb9e252c3..4a4ab832b28 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -161,6 +161,7 @@ typedef enum eAnim_ChannelType { ANIMTYPE_DSSKEY, ANIMTYPE_DSWOR, ANIMTYPE_DSNTREE, + ANIMTYPE_DSPART, ANIMTYPE_DSMBALL, ANIMTYPE_DSARM, ANIMTYPE_DSMESH, @@ -183,13 +184,7 @@ typedef enum eAnim_ChannelType { ANIMTYPE_NLAACTION, /* always as last item, the total number of channel types... */ - ANIMTYPE_NUM_TYPES, - - /* TODO: WARNING remove this entry or move to the right place when particle system is enabled again. - This definition was set here only to compile, but it is not used and cannot be in the middle of the list - or break the editors */ - ANIMTYPE_DSPART - + ANIMTYPE_NUM_TYPES } eAnim_ChannelType; /* types of keyframe data in bAnimListElem */ |