diff options
author | Philipp Oeser <info@graphics-engineer.com> | 2021-11-19 13:16:04 +0300 |
---|---|---|
committer | Philipp Oeser <info@graphics-engineer.com> | 2021-11-20 14:31:33 +0300 |
commit | b20997cb341ee993c770ed5ebddd0981f89b25c1 (patch) | |
tree | 91afeb9c1207ace23219fcce93ff4da92dfa7874 | |
parent | 092df8753414edfd75127204416e3ac5d71c4393 (diff) |
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.
-rw-r--r-- | source/blender/editors/animation/anim_filter.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index e1d046428a8..da5d5543136 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -1900,7 +1900,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; } |