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/editors/object | |
parent | e3c110e72e9d7a893d1681eeb84287032fc53d17 (diff) | |
parent | 18d135d05c53885eb7460e1c95cc8ebbdb771102 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r-- | source/blender/editors/object/object_ops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c index b6135eb177c..ca13f32ec52 100644 --- a/source/blender/editors/object/object_ops.c +++ b/source/blender/editors/object/object_ops.c @@ -308,7 +308,7 @@ void ED_keymap_object(wmKeyConfig *keyconf) wmKeyMapItem *kmi; /* Objects, Regardless of Mode -------------------------------------------------- */ - keymap = WM_keymap_find(keyconf, "Object Non-modal", 0, 0); + keymap = WM_keymap_ensure(keyconf, "Object Non-modal", 0, 0); /* modes */ kmi = WM_keymap_add_item(keymap, "OBJECT_OT_mode_set", TABKEY, KM_PRESS, 0, 0); @@ -327,7 +327,7 @@ void ED_keymap_object(wmKeyConfig *keyconf) /* Object Mode ---------------------------------------------------------------- */ /* Note: this keymap gets disabled in non-objectmode, */ - keymap = WM_keymap_find(keyconf, "Object Mode", 0, 0); + keymap = WM_keymap_ensure(keyconf, "Object Mode", 0, 0); keymap->poll = object_mode_poll; /* object mode supports PET now */ |