diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-01-03 06:04:11 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-01-03 06:04:11 +0300 |
commit | b423b891274af6262565e28199c5e53b0cde4374 (patch) | |
tree | 366fce3c08542cbc64b4d96c83f3639a404bfc0d /source/blender/windowmanager | |
parent | a8ce9a143abbb51eae28e5d0cae1fb310bd0c24c (diff) |
Tool System: enable fallback tool by default
This defaults to selection when not using a gizmo.
The previous behavior to drag anywhere can be set in the tool settings
or by selecting the fallback tool (Alt-W).
See: T66304
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 4 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_toolsystem.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 77d59dd3a8f..8eaba61fb5b 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -3751,10 +3751,6 @@ wmEventHandler_Keymap *WM_event_add_keymap_handler(ListBase *handlers, wmKeyMap wmKeyMap *WM_event_get_keymap_from_toolsystem_fallback(wmWindowManager *wm, wmEventHandler_Keymap *handler) { - if (!USER_EXPERIMENTAL_TEST(&U, use_tool_fallback)) { - return NULL; - } - ScrArea *sa = handler->dynamic.user_data; handler->keymap_tool = NULL; bToolRef_Runtime *tref_rt = sa->runtime.tool ? sa->runtime.tool->runtime : NULL; diff --git a/source/blender/windowmanager/intern/wm_toolsystem.c b/source/blender/windowmanager/intern/wm_toolsystem.c index 45836604109..3218f8c45e4 100644 --- a/source/blender/windowmanager/intern/wm_toolsystem.c +++ b/source/blender/windowmanager/intern/wm_toolsystem.c @@ -351,11 +351,11 @@ void WM_toolsystem_ref_set_from_runtime(struct bContext *C, *tref->runtime = *tref_rt; } - /* FIXME: ideally Python could check this gizmo group flag and not + /* Ideally Python could check this gizmo group flag and not * pass in the argument to begin with. */ bool use_fallback_keymap = false; - if (USER_EXPERIMENTAL_TEST(&U, use_tool_fallback)) { + if (tref->idname_fallback[0] || tref->runtime->keymap_fallback[0]) { if (tref_rt->gizmo_group[0]) { wmGizmoGroupType *gzgt = WM_gizmogrouptype_find(tref_rt->gizmo_group, false); if (gzgt) { |