[Bf-blender-cvs] [f043b0334b9] blender-v2.93-release: Fix T93194: greasepencil channel lists ignoring collection visibility
Philipp Oeser
noreply at git.blender.org
Tue Nov 23 10:08:16 CET 2021
Commit: f043b0334b91b93155e8317697adb11c2e256666
Author: Philipp Oeser
Date: Fri Nov 19 11:16:04 2021 +0100
Branches: blender-v2.93-release
https://developer.blender.org/rBf043b0334b91b93155e8317697adb11c2e256666
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 a03f19d0111..d9967a5b538 100644
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -1887,7 +1887,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;
}
More information about the Bf-blender-cvs
mailing list