diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-15 20:48:29 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-15 20:48:29 +0300 |
commit | 26ea8cd2d002bd8f306d7f192859295393865252 (patch) | |
tree | 281b1c72e8110227e40c563020107b175dd218a0 /source | |
parent | d1ff122db668ddd325ae19bc1cc53b93cf385bf7 (diff) |
Fix tool error opening Sculpt template.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenloader/intern/versioning_defaults.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c index ac441e33ebc..12d5e62aa18 100644 --- a/source/blender/blenloader/intern/versioning_defaults.c +++ b/source/blender/blenloader/intern/versioning_defaults.c @@ -111,13 +111,6 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template) } if (app_template == NULL) { - /* Clear all tools to use default options instead, ignore the tool saved in the file. */ - for (WorkSpace *workspace = bmain->workspaces.first; workspace; workspace = workspace->id.next) { - while (!BLI_listbase_is_empty(&workspace->tools)) { - BKE_workspace_tool_remove(workspace, workspace->tools.first); - } - } - /* Name all screens by their workspaces (avoids 'Default.###' names). */ { /* Default only has one window. */ @@ -187,6 +180,13 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template) STREQ(app_template, "Video_Editing"); if (builtin_template) { + /* Clear all tools to use default options instead, ignore the tool saved in the file. */ + for (WorkSpace *workspace = bmain->workspaces.first; workspace; workspace = workspace->id.next) { + while (!BLI_listbase_is_empty(&workspace->tools)) { + BKE_workspace_tool_remove(workspace, workspace->tools.first); + } + } + for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { /* Hide channels in timelines. */ for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { |