diff options
| author | Joshua Leung <aligorith@gmail.com> | 2010-02-17 13:21:07 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2010-02-17 13:21:07 +0300 |
| commit | a6e19982221dcc82d350d77cdb9bc16a2337ad9d (patch) | |
| tree | b8087c65b2e0d40a343fb1afe80cce0d49d03348 /source/blender/editors/include | |
| parent | c011bbbdb9013ed8a6a42ae728ccdb018ff661cd (diff) | |
Animation Editors - Texture Animation:
Texture animation is now shown in the animation editors. Texture stacks are shown for each Material/Lamp/World block that uses them.
There is currently still a bit of a bug with this which means that unless the owner of the texture stack is animated too, the animation data for the textures won't show up. This will get rectified soon though.
Diffstat (limited to 'source/blender/editors/include')
| -rw-r--r-- | source/blender/editors/include/ED_anim_api.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index 5f966b9ddc3..2f089a41a3f 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -134,6 +134,7 @@ typedef enum eAnim_ChannelType { ANIMTYPE_FILLDRIVERS, ANIMTYPE_FILLMATD, ANIMTYPE_FILLPARTD, + ANIMTYPE_FILLTEXD, ANIMTYPE_DSMAT, ANIMTYPE_DSLAM, @@ -146,6 +147,7 @@ typedef enum eAnim_ChannelType { ANIMTYPE_DSMBALL, ANIMTYPE_DSARM, ANIMTYPE_DSMESH, + ANIMTYPE_DSTEX, ANIMTYPE_SHAPEKEY, @@ -225,8 +227,13 @@ typedef enum eAnimFilter_Flags { /* '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) - /* 'Sub-AnimData' chanenls */ + /* 'Sub-AnimData' channels */ #define EXPANDED_DRVD(adt) ((adt->flag & ADT_DRIVERS_COLLAPSED)==0) + /* Texture expanders */ +#define FILTER_TEX_MATC(ma) ((ma->flag & MA_DS_SHOW_TEXS)) +#define FILTER_TEX_LAMC(la) ((la->flag & LA_DS_SHOW_TEXS)) +#define FILTER_TEX_WORC(wa) ((wo->flag & WO_DS_SHOW_TEXS)) +#define FILTER_TEX_DATA(tex) ((tex->flag & TEX_DS_EXPAND)) /* Actions (also used for Dopesheet) */ /* Action Channel Group */ |