[Bf-blender-cvs] [f174b40c59b] temp-vse-preview-transform2: Use box select as default tool in preview
Richard Antalik
noreply at git.blender.org
Wed Sep 15 17:19:57 CEST 2021
Commit: f174b40c59b685ba74f55ebcc75a7af44dabb837
Author: Richard Antalik
Date: Tue Sep 14 13:03:59 2021 +0200
Branches: temp-vse-preview-transform2
https://developer.blender.org/rBf174b40c59b685ba74f55ebcc75a7af44dabb837
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 51037db2e0c..b982cbb27b4 100644
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@ -54,6 +54,7 @@
#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"
@@ -1266,4 +1267,12 @@ 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 5eaf026191f..ef5ca48040b 100644
--- a/source/blender/windowmanager/intern/wm_toolsystem.c
+++ b/source/blender/windowmanager/intern/wm_toolsystem.c
@@ -703,14 +703,6 @@ 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";
}
}
More information about the Bf-blender-cvs
mailing list