diff options
| author | Joshua Leung <aligorith@gmail.com> | 2011-06-27 17:04:21 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2011-06-27 17:04:21 +0400 |
| commit | 26b7d513f17b79797d5d30dd93a06590c91b2b4d (patch) | |
| tree | 9b02bccf1982b9a1987b7a5e569020eb87bbf753 /source | |
| parent | ff5dbbe1b875d8354cd9d45f6873efcebd78b008 (diff) | |
Small bug fixes:
* Removing the last of the owner/ownertype stuff. The bulk of this
stuff was removed in Part3 of the refactor, but it seems I forgot to
actually remove these struct members at the end of that.
* Texture datablocks without animdata aren't skipped immediately
anymore. This could lead to texture nodetrees on animdata-less
textures getting skipped.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/animation/anim_filter.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/include/ED_anim_api.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index c82615eded4..da2a779f3a8 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -1359,7 +1359,7 @@ static size_t animdata_filter_ds_textures (bAnimContext *ac, ListBase *anim_data size_t tmp_items = 0; /* for now, if no texture returned, skip (this shouldn't confuse the user I hope) */ - if (ELEM(NULL, tex, tex->adt)) + if (tex == NULL) continue; /* add texture's animation data to temp collection */ @@ -1753,6 +1753,7 @@ static size_t animdata_filter_dopesheet_ob (bAnimContext *ac, ListBase *anim_dat } END_ANIMFILTER_SUBCHANNELS; + /* if we collected some channels, add these to the new list... */ if (tmp_items) { /* firstly add object expander if required */ diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index 7c23389ed6f..c149102a6a7 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -116,9 +116,6 @@ typedef struct bAnimListElem { struct ID *id; /* ID block that channel is attached to */ struct AnimData *adt; /* source of the animation data attached to ID block (for convenience) */ - - void *owner; /* group or channel which acts as this channel's owner */ - short ownertype; /* type of owner */ } bAnimListElem; |