diff options
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/versioning_300.c | 56 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_userdef.c | 5 |
2 files changed, 32 insertions, 29 deletions
diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c index afcfe185dc5..49b14dc84a6 100644 --- a/source/blender/blenloader/intern/versioning_300.c +++ b/source/blender/blenloader/intern/versioning_300.c @@ -864,6 +864,34 @@ void do_versions_after_linking_300(Main *bmain, ReportList *UNUSED(reports)) } } + if (!MAIN_VERSION_ATLEAST(bmain, 303, 6)) { + /* In the Dope Sheet, for every mode other than Timeline, open the Properties panel. */ + LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) { + LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) { + LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) { + if (sl->spacetype != SPACE_ACTION) { + continue; + } + + /* Skip the timeline, it shouldn't get its Properties panel opened. */ + SpaceAction *saction = (SpaceAction *)sl; + if (saction->mode == SACTCONT_TIMELINE) { + continue; + } + + const bool is_first_space = sl == area->spacedata.first; + ListBase *regionbase = is_first_space ? &area->regionbase : &sl->regionbase; + ARegion *region = BKE_region_find_in_listbase_by_type(regionbase, RGN_TYPE_UI); + if (region == NULL) { + continue; + } + + region->flag &= ~RGN_FLAG_HIDDEN; + } + } + } + } + /** * Versioning code until next subversion bump goes here. * @@ -876,34 +904,6 @@ void do_versions_after_linking_300(Main *bmain, ReportList *UNUSED(reports)) */ { /* Keep this block, even when empty. */ - - { - /* In the Dope Sheet, for every mode other than Timeline, open the Properties panel. */ - LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) { - LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) { - LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) { - if (sl->spacetype != SPACE_ACTION) { - continue; - } - - /* Skip the timeline, it shouldn't get its Properties panel opened. */ - SpaceAction *saction = (SpaceAction *)sl; - if (saction->mode == SACTCONT_TIMELINE) { - continue; - } - - const bool is_first_space = sl == area->spacedata.first; - ListBase *regionbase = is_first_space ? &area->regionbase : &sl->regionbase; - ARegion *region = BKE_region_find_in_listbase_by_type(regionbase, RGN_TYPE_UI); - if (region == NULL) { - continue; - } - - region->flag &= ~RGN_FLAG_HIDDEN; - } - } - } - } } } diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c index 4f62be26196..f8fb3b47570 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -83,6 +83,10 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) FROM_DEFAULT_V4_UCHAR(space_sequencer.list_text_hi); } + if (!USER_VERSION_ATLEAST(303, 6)) { + btheme->tui.wcol_view_item = U_theme_default.tui.wcol_view_item; + } + /** * Versioning code until next subversion bump goes here. * @@ -94,7 +98,6 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) */ { /* Keep this block, even when empty. */ - btheme->tui.wcol_view_item = U_theme_default.tui.wcol_view_item; } #undef FROM_DEFAULT_V4_UCHAR |