diff options
Diffstat (limited to 'source/blender/editors/include/ED_anim_api.h')
| -rw-r--r-- | source/blender/editors/include/ED_anim_api.h | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index 5fb7fa41752..22e85857251 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -35,6 +35,7 @@ struct AnimData; struct bContext; struct wmKeyConfig; +struct ReportList; struct ScrArea; struct ARegion; struct View2D; @@ -73,7 +74,8 @@ typedef struct bAnimContext { struct Scene *scene; /* active scene */ struct Object *obact; /* active object */ ListBase *markers; /* active set of markers */ - ListBase *reports; /* pointer to current reports list */ // XXX not yet used + + struct ReportList *reports; /* pointer to current reports list */ } bAnimContext; /* Main Data container types */ @@ -86,7 +88,7 @@ typedef enum eAnimCont_Types { ANIMCONT_DOPESHEET, /* dopesheet (bDopesheet) */ ANIMCONT_FCURVES, /* animation F-Curves (bDopesheet) */ ANIMCONT_DRIVERS, /* drivers (bDopesheet) */ - ANIMCONT_NLA, /* nla (bDopesheet) */ + ANIMCONT_NLA /* nla (bDopesheet) */ } eAnimCont_Types; /* --------------- Channels -------------------- */ @@ -151,6 +153,7 @@ typedef enum eAnim_ChannelType { ANIMTYPE_DSARM, ANIMTYPE_DSMESH, ANIMTYPE_DSTEX, + ANIMTYPE_DSLAT, ANIMTYPE_SHAPEKEY, @@ -161,7 +164,7 @@ typedef enum eAnim_ChannelType { ANIMTYPE_NLAACTION, /* always as last item, the total number of channel types... */ - ANIMTYPE_NUM_TYPES, + ANIMTYPE_NUM_TYPES } eAnim_ChannelType; /* types of keyframe data in bAnimListElem */ @@ -175,7 +178,7 @@ typedef enum eAnim_KeyType { ALE_SCE, /* Scene summary */ ALE_OB, /* Object summary */ ALE_ACT, /* Action summary */ - ALE_GROUP, /* Action Group summary */ + ALE_GROUP /* Action Group summary */ } eAnim_KeyType; /* ----------------- Filtering -------------------- */ @@ -228,6 +231,8 @@ typedef enum eAnimFilter_Flags { #define FILTER_MBALL_OBJD(mb) ((mb->flag2 & MB_DS_EXPAND)) #define FILTER_ARM_OBJD(arm) ((arm->flag & ARM_DS_EXPAND)) #define FILTER_MESH_OBJD(me) ((me->flag & ME_DS_EXPAND)) +#define FILTER_LATTICE_OBJD(lt) ((lt->flag & LT_DS_EXPAND)) + /* 'Sub-object/Action' channels (flags stored in Action) */ #define SEL_ACTC(actc) ((actc->flag & ACT_SELECTED)) #define EXPANDED_ACTC(actc) ((actc->flag & ACT_COLLAPSED)==0) @@ -325,17 +330,17 @@ typedef enum eAnimChannels_SetFlag { ACHANNEL_SETFLAG_CLEAR = 0, /* turn off */ ACHANNEL_SETFLAG_ADD, /* turn on */ ACHANNEL_SETFLAG_INVERT, /* on->off, off->on */ - ACHANNEL_SETFLAG_TOGGLE, /* some on -> all off // all on */ + ACHANNEL_SETFLAG_TOGGLE /* some on -> all off // all on */ } eAnimChannels_SetFlag; /* types of settings for AnimChannels */ typedef enum eAnimChannel_Settings { - ACHANNEL_SETTING_SELECT = 0, + ACHANNEL_SETTING_SELECT = 0, ACHANNEL_SETTING_PROTECT, // warning: for drawing UI's, need to check if this is off (maybe inverse this later) ACHANNEL_SETTING_MUTE, ACHANNEL_SETTING_EXPAND, ACHANNEL_SETTING_VISIBLE, /* only for Graph Editor */ - ACHANNEL_SETTING_SOLO, /* only for NLA Tracks */ + ACHANNEL_SETTING_SOLO /* only for NLA Tracks */ } eAnimChannel_Settings; @@ -343,7 +348,7 @@ typedef enum eAnimChannel_Settings { typedef struct bAnimChannelType { /* type data */ /* name of the channel type, for debugging */ - char *channel_type_name; + const char *channel_type_name; /* drawing */ /* get RGB color that is used to draw the majority of the backdrop */ @@ -442,7 +447,7 @@ enum { /* time indication in seconds or frames */ DRAWCFRA_UNIT_SECONDS = (1<<1), /* show time-offset line */ - DRAWCFRA_SHOW_TIMEOFS = (1<<2), + DRAWCFRA_SHOW_TIMEOFS = (1<<2) } eAnimEditDraw_CurrentFrame; /* main call to draw current-frame indicator in an Animation Editor */ @@ -517,7 +522,7 @@ typedef enum eAnimUnitConv_Flags { /* only touch selected BezTriples */ ANIM_UNITCONV_ONLYSEL = (1<<2), /* only touch selected vertices */ - ANIM_UNITCONV_SELVERTS = (1<<3), + ANIM_UNITCONV_SELVERTS = (1<<3) } eAnimUnitConv_Flags; /* Get unit conversion factor for given ID + F-Curve */ |