[Bf-blender-cvs] [70395ff7fda] blender-v2.83-release: Fix T93194: greasepencil channel lists ignoring collection visibility

[Philipp Oeser]

Commit: 70395ff7fda9fb6c7b68391dbfaad2a3038f27ca
Author: Philipp Oeser
Date:   Fri Nov 19 11:16:04 2021 +0100
Branches: blender-v2.83-release
https://developer.blender.org/rB70395ff7fda9fb6c7b68391dbfaad2a3038f27ca

Fix T93194: greasepencil channel lists ignoring collection visibility

Same fix as rB0a3b4d4c64f1, but this time for greasepencil.

To repeat: dopesheet in greasepencil mode was ignoring the temporariy
visibility flag of collections. As a result, even though the dopesheet
was supposed to show animation data of visible greasepencils only was
still showing such data of greasepencils that were hidden by hiding
their collection.

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

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 4dc0bef3a1b..5804b5c1354 100644
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -1870,7 +1870,8 @@ static size_t animdata_filter_gpencil(bAnimContext *ac,
       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) {
           continue;
         }