[Bf-blender-cvs] [26ea8cd2d00] blender2.8: Fix tool error opening Sculpt template.
Brecht Van Lommel
noreply at git.blender.org
Thu Nov 15 18:50:29 CET 2018
Commit: 26ea8cd2d002bd8f306d7f192859295393865252
Author: Brecht Van Lommel
Date: Thu Nov 15 18:48:29 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB26ea8cd2d002bd8f306d7f192859295393865252
Fix tool error opening Sculpt template.
===================================================================
M source/blender/blenloader/intern/versioning_defaults.c
===================================================================
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) {
More information about the Bf-blender-cvs
mailing list