diff options
| author | Joshua Leung <aligorith@gmail.com> | 2013-03-14 10:30:18 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2013-03-14 10:30:18 +0400 |
| commit | 396758757b4be84918366b436a42cb311f616518 (patch) | |
| tree | cb8caf203f17bd59d5fa1a70e78c54904028caa7 /source/blender/editors/animation/anim_filter.c | |
| parent | 92d45811c388ef9a22662521151aa00deca5d889 (diff) | |
Bugfix: Filtering option in NLA Editor to include AnimData blocks with no
actions or NLA data attached was broken
Looks like a typo whcih somehow slipped in at some stage, as I remember that
this used to work at some point 2 years ago!
Diffstat (limited to 'source/blender/editors/animation/anim_filter.c')
| -rw-r--r-- | source/blender/editors/animation/anim_filter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index e1ac5fa605b..b3b0b09bac0 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -446,7 +446,7 @@ short ANIM_animdata_get_context(const bContext *C, bAnimContext *ac) if (ANIMDATA_HAS_NLA(id)) { \ nlaOk \ } \ - else if (!(ads->filterflag & ADS_FILTER_NLA_NOACT) && ANIMDATA_HAS_KEYS(id)) { \ + else if (!(ads->filterflag & ADS_FILTER_NLA_NOACT) || ANIMDATA_HAS_KEYS(id)) { \ nlaOk \ } \ } \ |