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/makesrna/intern/rna_wm_api.c
parente3c110e72e9d7a893d1681eeb84287032fc53d17 (diff)
parent18d135d05c53885eb7460e1c95cc8ebbdb771102 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_wm_api.c')
-rw-r--r--source/blender/makesrna/intern/rna_wm_api.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_wm_api.c b/source/blender/makesrna/intern/rna_wm_api.c
index f235c170165..f8a9b00c724 100644
--- a/source/blender/makesrna/intern/rna_wm_api.c
+++ b/source/blender/makesrna/intern/rna_wm_api.c
@@ -286,7 +286,7 @@ static void rna_KeyMap_item_remove(wmKeyMap *km, ReportList *reports, PointerRNA
static wmKeyMap *rna_keymap_new(wmKeyConfig *keyconf, const char *idname, int spaceid, int regionid, bool modal)
{
if (modal == 0) {
- return WM_keymap_find(keyconf, idname, spaceid, regionid);
+ return WM_keymap_ensure(keyconf, idname, spaceid, regionid);
}
else {
return WM_modalkeymap_add(keyconf, idname, NULL); /* items will be lazy init */