diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-20 15:00:52 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-20 17:23:22 +0300 |
commit | 444934632a8d8e239bc0c6d79a638ec0943152a6 (patch) | |
tree | 0f29bf59f9232910ef24e2c9de5a153c3e1332c9 | |
parent | c9abb0fe2699478d1027667e6f527c8d60df5786 (diff) |
Workspaces: add new default workspaces in startup.blend.
-rw-r--r-- | release/datafiles/startup.blend | bin | 432264 -> 1192460 bytes | |||
-rw-r--r-- | source/blender/blenloader/intern/versioning_defaults.c | 28 |
2 files changed, 0 insertions, 28 deletions
diff --git a/release/datafiles/startup.blend b/release/datafiles/startup.blend Binary files differindex 23bb2646a54..94574738471 100644 --- a/release/datafiles/startup.blend +++ b/release/datafiles/startup.blend diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c index c120eed695c..5bddb81bfae 100644 --- a/source/blender/blenloader/intern/versioning_defaults.c +++ b/source/blender/blenloader/intern/versioning_defaults.c @@ -102,32 +102,6 @@ void BLO_update_defaults_userpref_blend(void) } /** - * New workspace design: Remove all screens/workspaces except of "Default" one and rename the workspace to "General". - * For compatibility, a new workspace has been created for each screen of old files, - * we only want one workspace and one screen in the default startup file however. - */ -static void update_defaults_startup_workspaces(Main *bmain) -{ - WorkSpace *workspace_default = NULL; - - for (WorkSpace *workspace = bmain->workspaces.first, *workspace_next; workspace; workspace = workspace_next) { - workspace_next = workspace->id.next; - - if (STREQ(workspace->id.name + 2, "Default")) { - /* don't rename within iterator, renaming causes listbase to be re-sorted */ - workspace_default = workspace; - } - else { - BKE_workspace_remove(bmain, workspace); - } - } - - /* rename "Default" workspace to "General" */ - BKE_libblock_rename(bmain, (ID *)workspace_default, "General"); - BLI_assert(BLI_listbase_count(BKE_workspace_layouts_get(workspace_default)) == 1); -} - -/** * Update defaults in startup.blend, without having to save and embed the file. * This function can be emptied each time the startup.blend is updated. */ void BLO_update_defaults_startup_blend(Main *bmain) @@ -274,8 +248,6 @@ void BLO_update_defaults_startup_blend(Main *bmain) linestyle->chain_count = 10; } - update_defaults_startup_workspaces(bmain); - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { for (ScrArea *area = screen->areabase.first; area; area = area->next) { for (SpaceLink *space_link = area->spacedata.first; space_link; space_link = space_link->next) { |