diff options
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/animation/anim_filter.c | 12 | ||||
-rw-r--r-- | source/blender/editors/space_nla/nla_draw.c | 16 |
2 files changed, 26 insertions, 2 deletions
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index e2c902d6131..c82615eded4 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -1365,7 +1365,16 @@ static size_t animdata_filter_ds_textures (bAnimContext *ac, ListBase *anim_data /* add texture's animation data to temp collection */ BEGIN_ANIMFILTER_SUBCHANNELS(FILTER_TEX_DATA(tex)) { + /* texture animdata */ tmp_items += animfilter_block_data(ac, &tmp_data, ads, (ID *)tex, filter_mode); + + /* nodes */ + if ((tex->nodetree) && !(ads->filterflag & ADS_FILTER_NONTREE)) { + /* owner_id as id instead of texture, since it'll otherwise be impossible to track the depth */ + // FIXME: perhaps as a result, textures should NOT be included under materials, but under their own section instead + // so that free-floating textures can also be animated + tmp_items += animdata_filter_ds_nodetree(ac, &tmp_data, ads, (ID *)tex, tex->nodetree, filter_mode); + } } END_ANIMFILTER_SUBCHANNELS; @@ -1415,9 +1424,8 @@ static size_t animdata_filter_ds_materials (bAnimContext *ac, ListBase *anim_dat tmp_items += animdata_filter_ds_textures(ac, &tmp_data, ads, (ID *)ma, filter_mode); /* nodes */ - if ((ma->nodetree) && !(ads->filterflag & ADS_FILTER_NONTREE)) { + if ((ma->nodetree) && !(ads->filterflag & ADS_FILTER_NONTREE)) tmp_items += animdata_filter_ds_nodetree(ac, &tmp_data, ads, (ID *)ma, ma->nodetree, filter_mode); - } } END_ANIMFILTER_SUBCHANNELS; diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c index 5138569539e..e61b348716b 100644 --- a/source/blender/editors/space_nla/nla_draw.c +++ b/source/blender/editors/space_nla/nla_draw.c @@ -625,6 +625,14 @@ static void draw_nla_channel_list_gl (bAnimContext *ac, ListBase *anim_data, Vie } break; + case NTREE_TEXTURE: + { + /* even more */ + offset= 21; + indent= 1; + } + break; + default: /* normal will do */ offset= 14; @@ -692,6 +700,14 @@ static void draw_nla_channel_list_gl (bAnimContext *ac, ListBase *anim_data, Vie } break; + case NTREE_TEXTURE: + { + /* even more */ + offset= 21; + indent= 1; + } + break; + default: /* normal will do */ offset= 14; |