[Bf-blender-cvs] [1c3c2867f70] temp-vse-preview-transform2: Revert "Use box select as default tool in preview"

[Richard Antalik]

Commit: 1c3c2867f7034bdb74ce90784bb439f89d42b4ca
Author: Richard Antalik
Date:   Thu Sep 16 04:20:01 2021 +0200
Branches: temp-vse-preview-transform2
https://developer.blender.org/rB1c3c2867f7034bdb74ce90784bb439f89d42b4ca

Revert "Use box select as default tool in preview"

===================================================================

M	source/blender/blenloader/intern/versioning_300.c
M	source/blender/windowmanager/intern/wm_toolsystem.c

===================================================================

diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c
index b982cbb27b4..51037db2e0c 100644
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@ -54,7 +54,6 @@
 #include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_node.h"
-#include "BKE_workspace.h"
 
 #include "RNA_access.h"
 #include "RNA_enum_types.h"
@@ -1267,12 +1266,4 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
       }
     }
   }
-  LISTBASE_FOREACH (WorkSpace *, workspace, &bmain->workspaces) {
-    if (STREQ(workspace->id.name + 2, "Video Editing")) {
-      LISTBASE_FOREACH_MUTABLE (bToolRef *, tool_ref, &workspace->tools) {
-        if (STREQ(tool_ref->idname, "builtin.sample"))
-          BKE_workspace_tool_remove(workspace, tool_ref);
-      }
-    }
-  }
 }
diff --git a/source/blender/windowmanager/intern/wm_toolsystem.c b/source/blender/windowmanager/intern/wm_toolsystem.c
index ef5ca48040b..5eaf026191f 100644
--- a/source/blender/windowmanager/intern/wm_toolsystem.c
+++ b/source/blender/windowmanager/intern/wm_toolsystem.c
@@ -703,6 +703,14 @@ static const char *toolsystem_default_tool(const bToolKey *tkey)
       return "builtin.select_box";
     }
     case SPACE_SEQ: {
+      switch (tkey->mode) {
+        case SEQ_VIEW_SEQUENCE:
+          return "builtin.select";
+        case SEQ_VIEW_PREVIEW:
+          return "builtin.sample";
+        case SEQ_VIEW_SEQUENCE_PREVIEW:
+          return "builtin.select";
+      }
       return "builtin.select_box";
     }
   }