Small bug fixes:
authorJoshua Leung <aligorith@gmail.com>
Mon, 27 Jun 2011 13:04:21 +0000 (13:04 +0000)
committerJoshua Leung <aligorith@gmail.com>
Mon, 27 Jun 2011 13:04:21 +0000 (13:04 +0000)
* 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.

source/blender/editors/animation/anim_filter.c
source/blender/editors/include/ED_anim_api.h

index c82615eded4202ce87888e8ac3ff578aad5d7f0d..da2a779f3a8378d130f87d39ff122a59659ec07a 100644 (file)
@@ -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 */
index 7c23389ed6fc32fe982c7985b7173859b36848bd..c149102a6a7995bf83f69c266b7be90c6ce314a7 100644 (file)
@@ -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;