diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-08-31 06:40:10 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-31 06:40:10 +0300 |
commit | 7c6136b35ca18da5a36b6030ade3b45dc5cb483d (patch) | |
tree | ccbb462c30e9c1f7419ff255e2ddfee7bbc81b91 /source/blender/windowmanager/intern/wm_operators.c | |
parent | e3c110e72e9d7a893d1681eeb84287032fc53d17 (diff) | |
parent | 18d135d05c53885eb7460e1c95cc8ebbdb771102 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager/intern/wm_operators.c')
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index baeae5fc68c..00506e68bcc 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -3444,7 +3444,7 @@ static void gesture_zoom_border_modal_keymap(wmKeyConfig *keyconf) /* default keymap for windows and screens, only call once per WM */ void wm_window_keymap(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_find(keyconf, "Window", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Window", 0, 0); wmKeyMapItem *kmi; /* note, this doesn't replace existing keymap items */ |