[Bf-blender-cvs] [981a3603100] tracking_tools: Tracking tools: Hide tool header in non-clip views

[Sergey Sharybin]

Commit: 981a3603100c6eb3ae7bfb09ae42408120ae5218
Author: Sergey Sharybin
Date:   Thu May 12 16:26:03 2022 +0200
Branches: tracking_tools
https://developer.blender.org/rB981a3603100c6eb3ae7bfb09ae42408120ae5218

Tracking tools: Hide tool header in non-clip views

There are no tools in those editors, so there is no reason to
waste screen space with empty header.

===================================================================

M	source/blender/blenloader/intern/versioning_300.c
M	source/blender/blenloader/intern/versioning_defaults.c

===================================================================

diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c
index 23d83684329..5c662e81d13 100644
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@ -3050,18 +3050,23 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
       for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
         LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
           LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
+            if (sl->spacetype != SPACE_CLIP) {
+              continue;
+            }
+
+            SpaceClip *space_clip = (SpaceClip *)sl;
             ListBase *regionbase = (sl == area->spacedata.first) ? &area->regionbase :
                                                                    &sl->regionbase;
-            if ((sl->spacetype == SPACE_CLIP) &&
-                (do_versions_find_region_or_null(regionbase, RGN_TYPE_TOOL_HEADER) == NULL)) {
-              SpaceClip *space_clip = (SpaceClip *)sl;
-              ARegion *region = do_versions_add_region_if_not_found(
-                  regionbase, RGN_TYPE_TOOL_HEADER, "tool header", RGN_TYPE_HEADER);
-              region->alignment = (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_BOTTOM :
-                                                                    RGN_ALIGN_TOP;
+
+            ARegion *new_tool_header = do_versions_add_region_if_not_found(
+                regionbase, RGN_TYPE_TOOL_HEADER, "tool header", RGN_TYPE_HEADER);
+
+            if (new_tool_header != NULL) {
+              new_tool_header->alignment = (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_BOTTOM :
+                                                                             RGN_ALIGN_TOP;
 
               if (space_clip->view != SC_VIEW_CLIP) {
-                region->flag |= RGN_FLAG_HIDDEN;
+                new_tool_header->flag |= RGN_FLAG_HIDDEN;
               }
             }
           }
diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index f65976ee55f..4cad01c5865 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -199,6 +199,9 @@ static void blo_update_defaults_screen(bScreen *screen,
               sl->spacetype == SPACE_SEQ) {
             region->flag |= RGN_FLAG_HIDDEN;
           }
+          else if ((sl->spacetype == SPACE_CLIP) && ((SpaceClip *)sl)->view != SC_VIEW_CLIP) {
+            region->flag |= RGN_FLAG_HIDDEN;
+          }
           else {
             region->flag &= ~(RGN_FLAG_HIDDEN | RGN_FLAG_HIDDEN_BY_USER);
           }