diff options
| author | Nick Wu <xp8110@live.com> | 2018-08-10 10:56:46 +0300 |
|---|---|---|
| committer | Nick Wu <xp8110@live.com> | 2018-08-10 10:56:46 +0300 |
| commit | 2d01210ea7f15838b139dd6c042f683033fe4bf8 (patch) | |
| tree | c2b1d99ba331dfd441064504d04d77f9b4b4e20e /source/blender/editors/mesh/mesh_ops.c | |
| parent | 83c85c9c985e82c2437a64ab540b26d7f8cce3af (diff) | |
| parent | eb7b450c0c65388758fcec5764a759d3d347c314 (diff) | |
Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr
# Conflicts:
# release/datafiles/locale
# release/scripts/addons_contrib
# source/blender/editors/mesh/editmesh_tools.c
# source/blender/editors/space_outliner/outliner_draw.c
# source/blender/makesdna/DNA_modifier_types.h
# source/blender/makesrna/intern/rna_modifier.c
# source/blender/modifiers/MOD_modifiertypes.h
# source/blender/modifiers/intern/MOD_util.c
# source/tools
Diffstat (limited to 'source/blender/editors/mesh/mesh_ops.c')
| -rw-r--r-- | source/blender/editors/mesh/mesh_ops.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c index 30cf5e8f6a5..fbdd44c9b9b 100644 --- a/source/blender/editors/mesh/mesh_ops.c +++ b/source/blender/editors/mesh/mesh_ops.c @@ -200,6 +200,15 @@ void ED_operatortypes_mesh(void) WM_operatortype_append(MESH_OT_bisect); WM_operatortype_append(MESH_OT_symmetrize); WM_operatortype_append(MESH_OT_symmetry_snap); + + WM_operatortype_append(MESH_OT_point_normals); + WM_operatortype_append(MESH_OT_merge_normals); + WM_operatortype_append(MESH_OT_split_normals); + WM_operatortype_append(MESH_OT_normals_tools); + WM_operatortype_append(MESH_OT_set_normals_from_faces); + WM_operatortype_append(MESH_OT_average_normals); + WM_operatortype_append(MESH_OT_smoothen_normals); + WM_operatortype_append(MESH_OT_mod_weighted_strength); } #if 0 /* UNUSED, remove? */ @@ -465,6 +474,8 @@ void ED_keymap_mesh(wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "MESH_OT_split", YKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "MESH_OT_vert_connect_path", JKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "MESH_OT_point_normals", LKEY, KM_PRESS, KM_ALT, 0); + /* Vertex Slide */ WM_keymap_add_item(keymap, "TRANSFORM_OT_vert_slide", VKEY, KM_PRESS, KM_SHIFT, 0); /* use KM_CLICK because same key is used for tweaks */ @@ -514,4 +525,5 @@ void ED_keymap_mesh(wmKeyConfig *keyconf) ED_keymap_proportional_editmode(keyconf, keymap, true); knifetool_modal_keymap(keyconf); + point_normals_modal_keymap(keyconf); } |