diff options
| author | Tianwei Shen <shentianweipku@gmail.com> | 2016-10-21 11:39:57 +0300 |
|---|---|---|
| committer | Tianwei Shen <shentianweipku@gmail.com> | 2016-10-21 11:39:57 +0300 |
| commit | a9e071d12d1583ee746e542f0bc9633c393ce952 (patch) | |
| tree | 213a8137271e39ce419185cc8542f090860b243f /source/blender/editors/include | |
| parent | 487284db94f9c82f26915efd8b12cefe2429221a (diff) | |
| parent | f7ce482385b760135a36ff778e8c3436cdcf5404 (diff) | |
Merge branch 'master' into soc-2016-multiview
Diffstat (limited to 'source/blender/editors/include')
| -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 b761139113d..4a4ab832b28 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -170,6 +170,7 @@ typedef enum eAnim_ChannelType { ANIMTYPE_DSLINESTYLE, ANIMTYPE_DSSPK, ANIMTYPE_DSGPENCIL, + ANIMTYPE_DSMCLIP, ANIMTYPE_SHAPEKEY, @@ -329,6 +330,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) |