[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55266] trunk/blender/source/blender/ editors/animation/anim_filter.c: Bugfix: Filtering option in NLA Editor to include AnimData blocks with no

[Joshua Leung]

Revision: 55266
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55266
Author:   aligorith
Date:     2013-03-14 06:30:18 +0000 (Thu, 14 Mar 2013)
Log Message:
-----------
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!

Modified Paths:
--------------
    trunk/blender/source/blender/editors/animation/anim_filter.c

Modified: trunk/blender/source/blender/editors/animation/anim_filter.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_filter.c	2013-03-14 05:59:34 UTC (rev 55265)
+++ trunk/blender/source/blender/editors/animation/anim_filter.c	2013-03-14 06:30:18 UTC (rev 55266)
@@ -446,7 +446,7 @@
 					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 \
 					} \
 				} \