Tool System: set a default tool for each mode

Also clear tools for the default startup file
so changes to defaults apply to new files.

1 files changed, 10 insertions, 0 deletions

diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index 8972e7ef56f..a741d0ecc1f 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -45,6 +45,7 @@
 #include "BKE_main.h"
 #include "BKE_node.h"
 #include "BKE_screen.h"
+#include "BKE_workspace.h"
 
 #include "BLO_readfile.h"
 
@@ -94,6 +95,15 @@ 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);
+			}
+		}
+	}
+
 	/* For 2D animation template. */
 	if (app_template && STREQ(app_template, "2D_Animation")) {
 		for (WorkSpace *workspace = bmain->workspaces.first; workspace; workspace = workspace->id.next) {