diff options
| author | Nick Wu <xp8110@live.com> | 2018-09-04 16:52:48 +0300 |
|---|---|---|
| committer | Nick Wu <xp8110@live.com> | 2018-09-04 16:52:48 +0300 |
| commit | de2c47cbf1e6a110ada8caedf6fc996cec760e09 (patch) | |
| tree | c5a83efbab0f8f4982df85ae475f45e902f18aeb /source/blender/editors/mesh/mesh_ops.c | |
| parent | f0eca87df637708504d7e79d9df004213adce675 (diff) | |
| parent | 113c180902cb112091dbf997beaff29884735b96 (diff) | |
Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr
# Conflicts:
# source/blender/makesdna/DNA_scene_types.h
Diffstat (limited to 'source/blender/editors/mesh/mesh_ops.c')
| -rw-r--r-- | source/blender/editors/mesh/mesh_ops.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c index 64f2ffb028c..54020d0afd9 100644 --- a/source/blender/editors/mesh/mesh_ops.c +++ b/source/blender/editors/mesh/mesh_ops.c @@ -41,6 +41,7 @@ #include "ED_mesh.h" #include "ED_screen.h" #include "ED_select_utils.h" +#include "ED_keymap_templates.h" #include "mesh_intern.h" /* own include */ @@ -379,12 +380,7 @@ void ED_keymap_mesh(wmKeyConfig *keyconf) kmi = WM_keymap_add_item(keymap, "MESH_OT_shortest_path_pick", SELECTMOUSE, KM_PRESS, KM_CTRL | KM_SHIFT, 0); RNA_boolean_set(kmi->ptr, "use_fill", true); - kmi = WM_keymap_add_item(keymap, "MESH_OT_select_all", AKEY, KM_PRESS, 0, 0); - RNA_enum_set(kmi->ptr, "action", SEL_SELECT); - kmi = WM_keymap_add_item(keymap, "MESH_OT_select_all", AKEY, KM_PRESS, KM_ALT, 0); - RNA_enum_set(kmi->ptr, "action", SEL_DESELECT); - kmi = WM_keymap_add_item(keymap, "MESH_OT_select_all", IKEY, KM_PRESS, KM_CTRL, 0); - RNA_enum_set(kmi->ptr, "action", SEL_INVERT); + ED_keymap_template_select_all(keymap, "MESH_OT_select_all"); WM_keymap_add_item(keymap, "MESH_OT_select_more", PADPLUSKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "MESH_OT_select_less", PADMINUS, KM_PRESS, KM_CTRL, 0); |