diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-07-26 20:11:59 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-07-26 20:11:59 +0400 |
| commit | 4bfef9a4434521a7d530829e3a932b5ef74bb06f (patch) | |
| tree | bfb26045ab9a5efc2bce3355ced95e1834b7a149 /source/blender/editors/animation | |
| parent | fb520785b65ed67c590e225a8e4a09689470d84e (diff) | |
Display animation data from lamps' node trees in animation editor windows
Diffstat (limited to 'source/blender/editors/animation')
| -rw-r--r-- | source/blender/editors/animation/anim_filter.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index 1dcb9f79a09..07e773b1e9a 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -1806,11 +1806,18 @@ static size_t animdata_filter_ds_obdata(bAnimContext *ac, ListBase *anim_data, b /* sub-data filtering... */ switch (ob->type) { - case OB_LAMP: /* lamp - textures */ + case OB_LAMP: /* lamp - textures + nodetree */ { + Lamp *la = ob->data; + bNodeTree *ntree = la->nodetree; + + /* nodetree */ + if ((ntree) && !(ads->filterflag & ADS_FILTER_NONTREE)) + tmp_items += animdata_filter_ds_nodetree(ac, &tmp_data, ads, &la->id, ntree, filter_mode); + /* textures */ if (!(ads->filterflag & ADS_FILTER_NOTEX)) - tmp_items += animdata_filter_ds_textures(ac, &tmp_data, ads, ob->data, filter_mode); + tmp_items += animdata_filter_ds_textures(ac, &tmp_data, ads, &la->id, filter_mode); } break; } |