diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-10-16 16:08:47 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-10-16 16:08:47 +0400 |
| commit | f6494ff3cf132e326cd18b4ec74b9d9ee61406fa (patch) | |
| tree | cdd953ed1a304c1c32e9f01457a0eb820d0296e8 /source/blender/editors/include/ED_anim_api.h | |
| parent | 6846abb2cae3efd3e5b9943d7eba3423cbef9da3 (diff) | |
ShapeKey Editor (sub-mode of DopeSheet Editor)
Special priority request from Durian team to get this sub-editor of the DopeSheet Editor restored. Originally I was kindof planning to drop it, but obviously it still has a role!
It now supports all the modern features that the DopeSheet supports, complete with selection, muting, locking, DopeSheet summary, and all the other tools that you know and love from the other views.
Also, this no longer uses the old hacky sliders that 2.4x used (instead it uses RNA-based ones), so should function just the same as other DopeSheet views).
Diffstat (limited to 'source/blender/editors/include/ED_anim_api.h')
| -rw-r--r-- | source/blender/editors/include/ED_anim_api.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index 271827c2aba..316f1b58d33 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -99,7 +99,7 @@ typedef struct bAnimListElem { void *data; /* source data this elem represents */ int type; /* one of the ANIMTYPE_* values */ int flag; /* copy of elem's flags for quick access */ - int index; /* copy of adrcode where applicable */ + int index; /* for un-named data, the index of the data in it's collection */ void *key_data; /* motion data - mostly F-Curves, but can be other types too */ short datatype; /* type of motion data to expect */ @@ -144,7 +144,7 @@ typedef enum eAnim_ChannelType { ANIMTYPE_DSMBALL, ANIMTYPE_DSARM, - ANIMTYPE_SHAPEKEY, // XXX probably can become depreceated??? + ANIMTYPE_SHAPEKEY, ANIMTYPE_GPDATABLOCK, ANIMTYPE_GPLAYER, @@ -209,7 +209,7 @@ typedef enum eAnimFilter_Flags { #define FILTER_MAT_OBJC(ob) ((ob->nlaflag & OB_ADS_SHOWMATS)) #define FILTER_PART_OBJC(ob) ((ob->nlaflag & OB_ADS_SHOWPARTS)) /* 'Sub-object' channels (flags stored in Data block) */ -#define FILTER_SKE_OBJD(key) ((key->flag & KEYBLOCK_DS_EXPAND)) +#define FILTER_SKE_OBJD(key) ((key->flag & KEY_DS_EXPAND)) #define FILTER_MAT_OBJD(ma) ((ma->flag & MA_DS_EXPAND)) #define FILTER_LAM_OBJD(la) ((la->flag & LA_DS_EXPAND)) #define FILTER_CAM_OBJD(ca) ((ca->flag & CAM_DS_EXPAND)) @@ -232,6 +232,10 @@ typedef enum eAnimFilter_Flags { #define EDITABLE_FCU(fcu) ((fcu->flag & FCURVE_PROTECTED)==0) #define SEL_FCU(fcu) (fcu->flag & (FCURVE_ACTIVE|FCURVE_SELECTED)) +/* ShapeKey mode only */ +#define EDITABLE_SHAPEKEY(kb) ((kb->flag & KEYBLOCK_LOCKED)==0) +#define SEL_SHAPEKEY(kb) (kb->flag & KEYBLOCK_SEL) + /* Grease Pencil only */ /* Grease Pencil datablock settings */ #define EXPANDED_GPD(gpd) (gpd->flag & GP_DATA_EXPAND) |