Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-08-31 06:40:10 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-08-31 06:40:10 +0300
commit7c6136b35ca18da5a36b6030ade3b45dc5cb483d (patch)
treeccbb462c30e9c1f7419ff255e2ddfee7bbc81b91 /source/blender/windowmanager/intern/wm_window.c
parente3c110e72e9d7a893d1681eeb84287032fc53d17 (diff)
parent18d135d05c53885eb7460e1c95cc8ebbdb771102 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager/intern/wm_window.c')
-rw-r--r--source/blender/windowmanager/intern/wm_window.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index 398ed7f1b70..568dfacd41c 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -767,13 +767,13 @@ void wm_window_ghostwindows_ensure(wmWindowManager *wm)
wm_window_ensure_eventstate(win);
/* add keymap handlers (1 handler for all keys in map!) */
- keymap = WM_keymap_find(wm->defaultconf, "Window", 0, 0);
+ keymap = WM_keymap_ensure(wm->defaultconf, "Window", 0, 0);
WM_event_add_keymap_handler(&win->handlers, keymap);
- keymap = WM_keymap_find(wm->defaultconf, "Screen", 0, 0);
+ keymap = WM_keymap_ensure(wm->defaultconf, "Screen", 0, 0);
WM_event_add_keymap_handler(&win->handlers, keymap);
- keymap = WM_keymap_find(wm->defaultconf, "Screen Editing", 0, 0);
+ keymap = WM_keymap_ensure(wm->defaultconf, "Screen Editing", 0, 0);
WM_event_add_keymap_handler(&win->modalhandlers, keymap);
/* add drop boxes */