diff options
author | Joshua Leung <aligorith@gmail.com> | 2014-11-21 15:29:32 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2014-11-21 15:30:17 +0300 |
commit | 419c2723d39f969ce3cf67b4960612e9d3fa03a1 (patch) | |
tree | 05b4db4452fdeb632e51bfb4911e76b5a80cf712 /source | |
parent | 62e9435dbc890de30181d4b20d190a656e96fd0b (diff) |
Bugfix T42048: Keyframes missing when animating particle system blend texture parameters
Textures attached to particle systems are now get their animation data listed
under the particle systems they are attached to now. This is the most convenient
and direct way that these can get included
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/animation/anim_filter.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index 3493fb181cc..e1b13e0cfca 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -1699,6 +1699,12 @@ static size_t animdata_filter_ds_textures(bAnimContext *ac, ListBase *anim_data, mtex = (MTex **)(&wo->mtex); break; } + case ID_PA: + { + ParticleSettings *part = (ParticleSettings *)owner_id; + mtex = (MTex **)(&part->mtex); + break; + } default: { /* invalid/unsupported option */ @@ -1910,8 +1916,12 @@ static size_t animdata_filter_ds_particles(bAnimContext *ac, ListBase *anim_data /* add particle-system's animation data to temp collection */ BEGIN_ANIMFILTER_SUBCHANNELS(FILTER_PART_OBJD(psys->part)) { - /* material's animation data */ + /* particle system's animation data */ tmp_items += animfilter_block_data(ac, &tmp_data, ads, (ID *)psys->part, filter_mode); + + /* textures */ + if (!(ads->filterflag & ADS_FILTER_NOTEX)) + tmp_items += animdata_filter_ds_textures(ac, &tmp_data, ads, (ID *)psys->part, filter_mode); } END_ANIMFILTER_SUBCHANNELS; |