diff options
author | Nick Wu <xp8110@live.com> | 2018-07-25 08:43:14 +0300 |
---|---|---|
committer | Nick Wu <xp8110@live.com> | 2018-07-25 08:43:14 +0300 |
commit | 88448dba155453fd265c228b3970d1eb86f1e101 (patch) | |
tree | 52555e0af4fcbded5c11a2ee4adf92a81fb3db0e /source/blender/editors/mesh/mesh_ops.c | |
parent | 7fa715cfb76c23f82a9d695fa1a6d07e9a162215 (diff) | |
parent | 2e112f591413eb8b49595c209298d61fec612476 (diff) |
Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr
Diffstat (limited to 'source/blender/editors/mesh/mesh_ops.c')
-rw-r--r-- | source/blender/editors/mesh/mesh_ops.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c index 63460fdf7b7..30cf5e8f6a5 100644 --- a/source/blender/editors/mesh/mesh_ops.c +++ b/source/blender/editors/mesh/mesh_ops.c @@ -335,22 +335,8 @@ void ED_keymap_mesh(wmKeyConfig *keyconf) kmi = WM_keymap_add_item(keymap, "MESH_OT_bevel", BKEY, KM_PRESS, KM_CTRL | KM_SHIFT, 0); RNA_boolean_set(kmi->ptr, "vertex_only", true); - /* selecting */ - for (int i = 0; i < 4; i++) { - const bool is_extend = (i & 1); - const bool is_expand = (i & 2); - const int key_modifier = (is_extend ? KM_SHIFT : 0) | (is_expand ? KM_CTRL : 0); - for (int j = 0; j < 3; j++) { - kmi = WM_keymap_add_item(keymap, "MESH_OT_select_mode", ONEKEY + j, KM_PRESS, key_modifier, 0); - RNA_enum_set(kmi->ptr, "type", SCE_SELECT_VERTEX << j); - if (is_extend) { - RNA_boolean_set(kmi->ptr, "use_extend", true); - } - if (is_expand) { - RNA_boolean_set(kmi->ptr, "use_expand", true); - } - } - } + /* Selec Vert/Edge/Face. */ + ED_keymap_editmesh_elem_mode(keyconf, keymap); /* standard mouse selection goes via space_view3d */ kmi = WM_keymap_add_item(keymap, "MESH_OT_loop_select", SELECTMOUSE, KM_PRESS, KM_ALT, 0); |