[Bf-blender-cvs] [0a3b4d4c64f] master: Fix channel lists ignoring collection visibility

Sybren A. Stüvel noreply at git.blender.org
Thu Feb 27 14:22:14 CET 2020


Commit: 0a3b4d4c64f15e0a39121d7bacb8e6096aa2130d
Author: Sybren A. Stüvel
Date:   Thu Feb 27 14:22:01 2020 +0100
Branches: master
https://developer.blender.org/rB0a3b4d4c64f15e0a39121d7bacb8e6096aa2130d

Fix channel lists ignoring collection visibility

The dope sheet, NLA editor, and other similar animation editors were
ignoring the temporariy visibility flag of collections. As a result, an
editor that's supposed to show animation data of visible objects only was
still showing such data of objects that were hidden by hiding their
collection.

This was observed while fixing T71743.

===================================================================

M	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 a9ddc53e5bb..5a0e60f8d58 100644
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -2996,7 +2996,7 @@ static bool animdata_filter_base_is_ok(bDopeSheet *ads, Base *base, int filter_m
    */
   if ((filter_mode & ANIMFILTER_DATA_VISIBLE) && !(ads->filterflag & ADS_FILTER_INCL_HIDDEN)) {
     /* layer visibility - we check both object and base, since these may not be in sync yet */
-    if ((base->flag & BASE_VISIBLE_DEPSGRAPH) == 0) {
+    if ((base->flag & BASE_VISIBLE_DEPSGRAPH) == 0 || (base->flag & BASE_VISIBLE_VIEWLAYER) == 0) {
       return false;
     }



More information about the Bf-blender-cvs mailing list