diff options
author | Richard Antalik <richardantalik@gmail.com> | 2021-11-17 05:12:19 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2021-11-17 05:12:19 +0300 |
commit | f72dc005696f7259a15061c59212129ea1836d80 (patch) | |
tree | 9ae67216b47cc115d87cf6fd6d6f14f13a6432e2 /source/blender | |
parent | 4c988eb3e144712b98fddc97b2e669e88a23eaa8 (diff) | |
parent | 9bdf3fa5f01b01bf9461a3ba6707d231bbbc5e9e (diff) |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenloader/intern/versioning_300.c | 16 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/space_sequencer.c | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c index 5296a0b4f82..e0e59600704 100644 --- a/source/blender/blenloader/intern/versioning_300.c +++ b/source/blender/blenloader/intern/versioning_300.c @@ -2178,5 +2178,21 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain) } } FOREACH_NODETREE_END; + + LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) { + LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) { + LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) { + if (sl->spacetype == SPACE_SEQ) { + ListBase *regionbase = (sl == area->spacedata.first) ? &area->regionbase : + &sl->regionbase; + LISTBASE_FOREACH (ARegion *, region, regionbase) { + if (region->regiontype == RGN_TYPE_WINDOW) { + region->v2d.min[1] = 1.0f; + } + } + } + } + } + } } } diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c index fc20739b5e2..4b6c5e29d77 100644 --- a/source/blender/editors/space_sequencer/space_sequencer.c +++ b/source/blender/editors/space_sequencer/space_sequencer.c @@ -184,7 +184,7 @@ static SpaceLink *sequencer_create(const ScrArea *UNUSED(area), const Scene *sce region->v2d.cur = region->v2d.tot; region->v2d.min[0] = 10.0f; - region->v2d.min[1] = 4.0f; + region->v2d.min[1] = 1.0f; region->v2d.max[0] = MAXFRAMEF; region->v2d.max[1] = MAXSEQ; |