diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-07-03 21:11:33 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-07-03 21:11:33 +0400 |
| commit | 76b3f6edcc927fa34bc2c5f90608f62d01a03d23 (patch) | |
| tree | 66d51077cd0a72ffbcc4ea1f15fab49654c2c954 /source/blender/windowmanager | |
| parent | 721237cf29b5dd1a8fe7e84223d0b7e62e16330b (diff) | |
Fix #35933: setting shortcut keys in object mode menu didn't work correct.
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index 6a2611592f1..13230f48a15 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -1297,7 +1297,11 @@ wmKeyMap *WM_keymap_guess_opname(const bContext *C, const char *opname) km = WM_keymap_find_all(C, "3D View", sl->spacetype, 0); } else if (strstr(opname, "OBJECT_OT")) { - km = WM_keymap_find_all(C, "Object Mode", 0, 0); + /* exception, this needs to work outside object mode too */ + if (strstr(opname, "OBJECT_OT_mode_set")) + km = WM_keymap_find_all(C, "Object Non-modal", 0, 0); + else + km = WM_keymap_find_all(C, "Object Mode", 0, 0); } |