diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-10-19 12:29:15 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-19 12:29:15 +0300 |
| commit | 51b2d06613bb3a11a04f051d7dabaa6530a0e5c0 (patch) | |
| tree | 95231ba74cfd3546b3b63b8020588bc63c5e3561 /source/blender/blenloader | |
| parent | 16882ca5356d5861e3266b99e9b2434e5cf49073 (diff) | |
Versioning: name screens by their workspaces
Avoids all screens in the startup file being named 'Default.###'.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_defaults.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c index 2a454a02f42..c843ebe6765 100644 --- a/source/blender/blenloader/intern/versioning_defaults.c +++ b/source/blender/blenloader/intern/versioning_defaults.c @@ -39,6 +39,7 @@ #include "DNA_userdef_types.h" #include "DNA_object_types.h" #include "DNA_workspace_types.h" +#include "DNA_windowmanager_types.h" #include "BKE_colortools.h" #include "BKE_layer.h" @@ -103,9 +104,20 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template) } } + /* Name all screens by their workspaces (avoids 'Default.###' names). */ + { + /* Default only has one window. */ + wmWindow *win = ((wmWindowManager *)bmain->wm.first)->windows.first; + for (WorkSpace *workspace = bmain->workspaces.first; workspace; workspace = workspace->id.next) { + WorkSpaceLayout *layout = BKE_workspace_hook_layout_for_workspace_get(win->workspace_hook, workspace); + bScreen *screen = layout->screen; + BLI_strncpy(screen->id.name + 2, workspace->id.name + 2, sizeof(screen->id.name) - 2); + } + } + { /* 'UV Editing' should use UV mode. */ - bScreen *screen = BLI_findstring(&bmain->screen, "Default.005", offsetof(ID, name) + 2); + bScreen *screen = BLI_findstring(&bmain->screen, "UV Editing", offsetof(ID, name) + 2); for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_IMAGE) { |