Timeline/Dope sheet/NLA editors - slider covers button to call sidebar

Bforartists · Nov 26, 2020 · 046ea1c · 046ea1c
1 parent c6575cb
commit 046ea1c
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 1 deletion.
diff --git a/release/datafiles/startup.blend b/release/datafiles/startup.blend
diff --git a/release/scripts/startup/bl_app_templates_system/2D_Animation/startup.blend b/release/scripts/startup/bl_app_templates_system/2D_Animation/startup.blend
diff --git a/release/scripts/startup/bl_app_templates_system/All/startup.blend b/release/scripts/startup/bl_app_templates_system/All/startup.blend
diff --git a/release/scripts/startup/bl_app_templates_system/VFX/startup.blend b/release/scripts/startup/bl_app_templates_system/VFX/startup.blend
diff --git a/release/scripts/startup/bl_app_templates_system/Video_Editing/startup.blend b/release/scripts/startup/bl_app_templates_system/Video_Editing/startup.blend
diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
@@ -115,6 +115,10 @@ static void blo_update_defaults_screen(bScreen *screen,
       if (ELEM(region->regiontype, RGN_TYPE_UI, RGN_TYPE_TOOLS, RGN_TYPE_TOOL_PROPS)) {
         region->v2d.flag &= ~V2D_IS_INIT;
       }
+      /* bfa - Timeline/Dope sheet/NLA editors - slider covers button to call sidebar */
+      if (region->regiontype == RGN_TYPE_WINDOW && (region->v2d.scroll & V2D_SCROLL_RIGHT)) {
+        region->v2d.scroll |= V2D_SCROLL_VERTICAL_HANDLES;
+      }
     }
 
     /* Set default folder. */

diff --git a/source/blender/editors/space_nla/space_nla.c b/source/blender/editors/space_nla/space_nla.c
@@ -120,7 +120,8 @@ static SpaceLink *nla_create(const ScrArea *area, const Scene *scene)
   region->v2d.minzoom = 0.01f;
   region->v2d.maxzoom = 50;
   region->v2d.scroll = (V2D_SCROLL_BOTTOM | V2D_SCROLL_HORIZONTAL_HANDLES);
-  region->v2d.scroll |= V2D_SCROLL_RIGHT;
+  /* bfa - NLA editor - slider covers button to call sidebar */
+  region->v2d.scroll |= (V2D_SCROLL_RIGHT | V2D_SCROLL_VERTICAL_HANDLES);
   region->v2d.keepzoom = V2D_LOCKZOOM_Y;
   region->v2d.keepofs = V2D_KEEPOFS_Y;
   region->v2d.align = V2D_ALIGN_NO_POS_Y;