diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2021-11-20 14:47:31 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2021-11-20 14:47:31 +0300 |
| commit | 3d447b6335f477fb58e3f2325eb3487a3d187dbb (patch) | |
| tree | 3a087bd887b44e7540b1a958c83bb11a7dd8b60b /source/blender/editors/animation | |
| parent | 3baaab15fc9983b2efd4f67da98faa15c742074e (diff) | |
| parent | b20997cb341ee993c770ed5ebddd0981f89b25c1 (diff) | |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source/blender/editors/animation')
| -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; } |