diff options
| author | Yiming Wu <xp8110@outlook.com> | 2019-03-08 14:12:37 +0300 |
|---|---|---|
| committer | Yiming Wu <xp8110@outlook.com> | 2019-03-08 14:12:37 +0300 |
| commit | 26fc7ef55f1584bcf9fd262419f1a3f540c186af (patch) | |
| tree | 5dc5c93434683a8f211ae5e852ac18c793bc0510 /source/blender/editors/mesh/mesh_ops.c | |
| parent | 0ed55524f150003a0121c4e7e5f5c26c52184e00 (diff) | |
| parent | cf09a2443cef60cda28c2c2023cb84728e644081 (diff) | |
Merge branch 'master' into soc-2018-npr
# Conflicts:
# release/datafiles/locale
# release/scripts/addons
# release/scripts/addons_contrib
# source/blender/draw/intern/DRW_render.h
# source/blender/makesdna/DNA_light_types.h
# source/blender/makesdna/DNA_scene_types.h
# source/blender/makesrna/intern/rna_scene.c
# source/tools
Diffstat (limited to 'source/blender/editors/mesh/mesh_ops.c')
| -rw-r--r-- | source/blender/editors/mesh/mesh_ops.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c index fe3703babf4..566f49878fb 100644 --- a/source/blender/editors/mesh/mesh_ops.c +++ b/source/blender/editors/mesh/mesh_ops.c @@ -1,6 +1,4 @@ /* - * ***** BEGIN GPL LICENSE BLOCK ***** - * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 @@ -17,21 +15,15 @@ * * The Original Code is Copyright (C) 2009 Blender Foundation. * All rights reserved. - * - * - * Contributor(s): Blender Foundation - * - * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/editors/mesh/mesh_ops.c - * \ingroup edmesh +/** \file + * \ingroup edmesh */ #include "DNA_scene_types.h" #include "DNA_modifier_types.h" - #include "RNA_access.h" #include "WM_api.h" @@ -329,4 +321,5 @@ void ED_keymap_mesh(wmKeyConfig *keyconf) knifetool_modal_keymap(keyconf); point_normals_modal_keymap(keyconf); + bevel_modal_keymap(keyconf); } |