[Bf-blender-cvs] [8146eac905f] tracking_tools: Merge branch 'master' into tracking_tools

[Sergey Sharybin]

Commit: 8146eac905f0c64f3928da0c65bd2b465094a187
Author: Sergey Sharybin
Date:   Thu May 19 11:32:12 2022 +0200
Branches: tracking_tools
https://developer.blender.org/rB8146eac905f0c64f3928da0c65bd2b465094a187

Merge branch 'master' into tracking_tools

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index 5c662e81d13,74621a477cd..b5448fe1dca
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -3046,32 -3055,12 +3055,40 @@@ void blo_do_versions_300(FileData *fd, 
        }
      }
  
+     /* Merge still offsets into start/end offsets. */
+     LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
+       Editing *ed = SEQ_editing_get(scene);
+       if (ed != NULL) {
+         SEQ_for_each_callback(&ed->seqbase, version_merge_still_offsets, NULL);
+       }
+     }
++
 +    {
 +      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;
 +
 +            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) {
 +                new_tool_header->flag |= RGN_FLAG_HIDDEN;
 +              }
 +            }
 +          }
 +        }
 +      }
 +    }
    }
--}
++}