Merge branch 'blender-v3.0-release'

2021-11-20 12:47:31 +01:00 · 2021-11-20 12:47:31 +01:00 · 3d447b6335
parent 3baaab15fc b20997cb34
commit 3d447b6335
1 changed files with 2 additions and 1 deletions
--- 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;
        }