diff options
| author | Joshua Leung <aligorith@gmail.com> | 2010-02-09 08:45:02 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2010-02-09 08:45:02 +0300 |
| commit | 3467980b8aec82851db206dd03c4619824b68c07 (patch) | |
| tree | f763323a989a0872eab824b5bedd6f28e528d0a1 /source/blender | |
| parent | d359edbc8404d6170534ce56d25c91865f5cec05 (diff) | |
Bugfix #21030: Non-visible animation channel-groups can get deleted
Bugfix #21031: Non-visible animation channels affected by fcurve visibility toggle hotkeys
Removed a bad check for the selection filtering check from animation editor filtering for groups+fcurves. This check meant that groups that were not visible due to not having any visible F-Curves would end up being shown too.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/animation/anim_filter.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index 193794cea0c..a8552d3accc 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -471,6 +471,7 @@ bAnimListElem *make_new_animlistelem (void *data, short datatype, void *owner, s ale->data= data; ale->type= datatype; // XXX what is the point of the owner data? + // xxx try and use this to simplify the problem of finding whether parent channels are working... ale->owner= owner; ale->ownertype= ownertype; @@ -938,16 +939,10 @@ static int animdata_filter_action (bAnimContext *ac, ListBase *anim_data, bDopeS /* get the first F-Curve in this group we can start to use, * and if there isn't any F-Curve to start from, then don't * this group at all... - * - * exceptions for when we might not care whether there's anything inside this group or not - * - if we're interested in channels and their selections, in which case group channel should get considered too - * even if all its sub channels are hidden... */ first_fcu = animdata_filter_fcurve_next(ads, agrp->channels.first, agrp, filter_mode, owner_id); - if ( (filter_mode & (ANIMFILTER_SEL|ANIMFILTER_UNSEL)) || - (first_fcu) ) - { + if (first_fcu) { /* add this group as a channel first */ if ((filter_mode & ANIMFILTER_CHANNELS) || !(filter_mode & ANIMFILTER_CURVESONLY)) { /* check if filtering by selection */ |