blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Keymap: ignore the fallback keymap when "Active Tool" is set 

Resolve regression in c9d9bfa84a,
which added support for tools to be tagged as using a fallback too.

In these cases the "Active Tool" setting was ignored and the fallback
tool would be used (the spin tool would box select for example).
This commit is contained in:
Campbell Barton 2021-10-06 23:43:34 +11:00
parent 539575b585
commit cda20a7af8
Notes: blender-bot 2023-02-14 09:48:25 +01:00 
Referenced by issue #92146, EXCEPTION_ACCESS_VIOLATION closing render result window after alt-tab
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/windowmanager/intern/wm_event_system.c
View File

@ -4025,6 +4025,7 @@ void WM_event_get_keymap_from_toolsystem_fallback(wmWindowManager *wm,
const char *keymap_id_list[ARRAY_SIZE(km_result->keymaps)];
int keymap_id_list_len = 0;
const Scene *scene = wm->winactive->scene;
ScrArea *area = handler->dynamic.user_data;
handler->keymap_tool = NULL;
bToolRef_Runtime *tref_rt = area->runtime.tool ? area->runtime.tool->runtime : NULL;
@ -4036,7 +4037,8 @@ void WM_event_get_keymap_from_toolsystem_fallback(wmWindowManager *wm,
bool is_gizmo_visible = false;
bool is_gizmo_highlight = false;
if (tref_rt && tref_rt->keymap_fallback[0]) {
if ((tref_rt && tref_rt->keymap_fallback[0]) &&
(scene->toolsettings->workspace_tool_type == SCE_WORKSPACE_TOOL_FALLBACK)) {
bool add_keymap = false;
/* Support for the gizmo owning the tool keymap. */