diff options
| author | Nick Wu <xp8110@live.com> | 2018-09-01 06:03:10 +0300 |
|---|---|---|
| committer | Nick Wu <xp8110@live.com> | 2018-09-01 06:03:10 +0300 |
| commit | 3fc578d7cb4409aaba86ea179f27fdf71554a733 (patch) | |
| tree | 297977876eceb922f9984b02ba1819c4e37d91c2 /source/blender/editors/mesh/mesh_ops.c | |
| parent | ef234a2e61deab309606df9cee724e54bf7be76b (diff) | |
| parent | a5f950ed3814b7c09e388a976ec0e5dd325bedd2 (diff) | |
Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr
# Conflicts:
# source/blender/CMakeLists.txt
Diffstat (limited to 'source/blender/editors/mesh/mesh_ops.c')
| -rw-r--r-- | source/blender/editors/mesh/mesh_ops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c index d67bc77fb0a..64f2ffb028c 100644 --- a/source/blender/editors/mesh/mesh_ops.c +++ b/source/blender/editors/mesh/mesh_ops.c @@ -328,7 +328,7 @@ void ED_keymap_mesh(wmKeyConfig *keyconf) wmKeyMap *keymap; wmKeyMapItem *kmi; - keymap = WM_keymap_find(keyconf, "Mesh", 0, 0); + keymap = WM_keymap_ensure(keyconf, "Mesh", 0, 0); keymap->poll = ED_operator_editmesh; kmi = WM_keymap_add_item(keymap, "MESH_OT_loopcut_slide", RKEY, KM_PRESS, KM_CTRL, 0); @@ -475,7 +475,7 @@ void ED_keymap_mesh(wmKeyConfig *keyconf) // WM_keymap_add_item(keymap, "MESH_OT_skin", FKEY, KM_PRESS, KM_CTRL|KM_ALT, 0); /* python, removed */ WM_keymap_add_item(keymap, "MESH_OT_duplicate_move", DKEY, KM_PRESS, KM_SHIFT, 0); - WM_keymap_add_menu(keymap, "INFO_MT_mesh_add", AKEY, KM_PRESS, KM_SHIFT, 0); + WM_keymap_add_menu(keymap, "VIEW3D_MT_mesh_add", AKEY, KM_PRESS, KM_SHIFT, 0); WM_keymap_add_item(keymap, "MESH_OT_separate", PKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "MESH_OT_split", YKEY, KM_PRESS, 0, 0); |