Bugfix: Filtering option in NLA Editor to include AnimData blocks with no
authorJoshua Leung <aligorith@gmail.com>
Thu, 14 Mar 2013 06:30:18 +0000 (06:30 +0000)
committerJoshua Leung <aligorith@gmail.com>
Thu, 14 Mar 2013 06:30:18 +0000 (06:30 +0000)
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

index e1ac5fa605b005e3bbc70f63687ae14b5462c4c1..b3b0b09bac03f707033ab440c40794959dbde4a6 100644 (file)
@@ -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 \
                                        } \
                                } \