Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2021-11-19 13:16:04 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2022-01-17 17:26:13 +0300
commit70395ff7fda9fb6c7b68391dbfaad2a3038f27ca (patch)
treefd1f22b6962edf12ea29b7b33f90282c03f3ef70 /source
parent798b989e7dae86013412af9a478b1959adf986d7 (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.
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/animation/anim_filter.c3
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 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;
}