From 396758757b4be84918366b436a42cb311f616518 Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Thu, 14 Mar 2013 06:30:18 +0000 Subject: 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! --- source/blender/editors/animation/anim_filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/editors/animation/anim_filter.c') 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 \ } \ } \ -- cgit v1.2.3