diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-10-15 11:05:03 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-10-15 11:05:03 +0300 |
| commit | fcff9843384ff72a9549cfb301bdbd418aa12d1b (patch) | |
| tree | 0bf3ce1a7544072710230e219c16fd3a471c4b22 /source/blender/editors/include/ED_anim_api.h | |
| parent | 9632ca0a13b415a83572378862a44047e0a362e0 (diff) | |
| parent | 7fec7eee2070aac701f7918311a05ca2bfd1b3b0 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/include/ED_anim_api.h')
| -rw-r--r-- | source/blender/editors/include/ED_anim_api.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index e05f15ce7fc..4ca7eaf0943 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -169,6 +169,7 @@ typedef enum eAnim_ChannelType { ANIMTYPE_DSLINESTYLE, ANIMTYPE_DSSPK, ANIMTYPE_DSGPENCIL, + ANIMTYPE_DSMCLIP, ANIMTYPE_SHAPEKEY, @@ -327,6 +328,8 @@ typedef enum eAnimFilter_Flags { #define SEL_NLT(nlt) (nlt->flag & NLATRACK_SELECTED) #define EDITABLE_NLT(nlt) ((nlt->flag & NLATRACK_PROTECTED) == 0) +/* Movie clip only */ +#define EXPANDED_MCLIP(clip) (clip->flag & MCLIP_DATA_EXPAND) /* AnimData - NLA mostly... */ #define SEL_ANIMDATA(adt) (adt->flag & ADT_UI_SELECTED) |