[Bf-blender-cvs] [e8d79bab018] temp-vse-channels-edge-panning: Merge branch 'transform-edgepan' into test

[Richard Antalik]

Commit: e8d79bab018bceffae756b2fec02cebe8bb53207
Author: Richard Antalik
Date:   Wed Mar 9 18:01:43 2022 +0100
Branches: temp-vse-channels-edge-panning
https://developer.blender.org/rBe8d79bab018bceffae756b2fec02cebe8bb53207

Merge branch 'transform-edgepan' into test

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index 2f2a83a1145,b3c088e1378..f4a1f2d63d9
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -2589,56 -2580,29 +2589,60 @@@ void blo_do_versions_300(FileData *fd, 
              continue;
            }
  
 -          ARegion *timeline_region = BKE_area_find_region_type(area, RGN_TYPE_WINDOW);
 -
 -          if (timeline_region == NULL) {
 -            continue;
++<<<<<<< HEAD
 +          ListBase *regionbase = (sl == area->spacedata.first) ? &area->regionbase :
 +                                                                 &sl->regionbase;
 +          ARegion *region = BKE_area_find_region_type(area, RGN_TYPE_CHANNELS);
 +          if (!region) {
 +            ARegion *tools_region = BKE_area_find_region_type(area, RGN_TYPE_TOOLS);
 +            region = do_versions_add_region(RGN_TYPE_CHANNELS, "channels region");
 +            BLI_insertlinkafter(regionbase, tools_region, region);
 +            region->alignment = RGN_ALIGN_LEFT;
 +            region->v2d.flag |= V2D_VIEWSYNC_AREA_VERTICAL;
            }
  
 -          timeline_region->v2d.cur.ymax = 8.5f;
 -          timeline_region->v2d.align &= ~V2D_ALIGN_NO_NEG_Y;
 +          ARegion *timeline_region = BKE_area_find_region_type(area, RGN_TYPE_WINDOW);
 +          if (timeline_region != NULL) {
 +            timeline_region->v2d.flag |= V2D_VIEWSYNC_AREA_VERTICAL;
++            timeline_region->v2d.cur.ymax = 8.5f;
++            timeline_region->v2d.align &= ~V2D_ALIGN_NO_NEG_Y;
 +          }
          }
        }
      }
+   }
  
-     /* Initialize channels. */
-     LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
-       Editing *ed = SEQ_editing_get(scene);
-       if (ed == NULL > 0) {
-         continue;
-       }
-       SEQ_channels_ensure(&ed->channels);
-       SEQ_for_each_callback(&scene->ed->seqbase, seq_meta_channels_ensure, NULL);
 -  /**
 -   * Versioning code until next subversion bump goes here.
 -   *
 -   * \note Be sure to check when bumping the version:
 -   * - "versioning_userdef.c", #blo_do_versions_userdef
 -   * - "versioning_userdef.c", #do_versions_theme
 -   *
 -   * \note Keep this message at the bottom of the function.
 -   */
 -  {
 -    /* Keep this block, even when empty. */
++  /* Initialize channels. */
++  LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
++    Editing *ed = SEQ_editing_get(scene);
++    if (ed == NULL > 0) {
++      continue;
++    }
++    SEQ_channels_ensure(&ed->channels);
++    SEQ_for_each_callback(&scene->ed->seqbase, seq_meta_channels_ensure, NULL);
 +
-       ed->active_channels = &ed->channels;
++    ed->active_channels = &ed->channels;
 +
-       ListBase *previous_channels = &ed->channels;
-       LISTBASE_FOREACH (MetaStack *, ms, &ed->metastack) {
-         ms->old_channels = previous_channels;
-         previous_channels = &ms->parseq->channels;
-         /* If `MetaStack` exists, active channels must point to last link. */
-         ed->active_channels = &ms->parseq->channels;
-       }
++    ListBase *previous_channels = &ed->channels;
++    LISTBASE_FOREACH (MetaStack *, ms, &ed->metastack) {
++      ms->old_channels = previous_channels;
++      previous_channels = &ms->parseq->channels;
++      /* If `MetaStack` exists, active channels must point to last link. */
++      ed->active_channels = &ms->parseq->channels;
 +    }
    }
+ }
 +
-   /**
-    * Versioning code until next subversion bump goes here.
-    *
-    * \note Be sure to check when bumping the version:
-    * - "versioning_userdef.c", #blo_do_versions_userdef
-    * - "versioning_userdef.c", #do_versions_theme
-    *
-    * \note Keep this message at the bottom of the function.
-    */
-   {
-     /* Keep this block, even when empty. */
-   }
++/**
++ * Versioning code until next subversion bump goes here.
++ *
++ * \note Be sure to check when bumping the version:
++ * - "versioning_userdef.c", #blo_do_versions_userdef
++ * - "versioning_userdef.c", #do_versions_theme
++ *
++ * \note Keep this message at the bottom of the function.
++ */
++{
++  /* Keep this block, even when empty. */
++}
 +}