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-23 11:09:28 +0300 |
| commit | f043b0334b91b93155e8317697adb11c2e256666 (patch) | |
| tree | 27650a9826d00846628f008c488e0ead31241b60 /source/blender/editors | |
| parent | 419b4e0b00c6e4191d1fd70925040e0215dd933d (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/blender/editors')
| -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 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; } |