diff options
| author | Nick Wu <xp8110@live.com> | 2018-08-16 10:37:02 +0300 |
|---|---|---|
| committer | Nick Wu <xp8110@live.com> | 2018-08-16 10:37:02 +0300 |
| commit | d40a1bc3ccc208d67847b3ee887dae32a48fb837 (patch) | |
| tree | 078e71278ffb1bf3006d1544f8d0d1600b282ff4 /source/blender/editors/mesh/mesh_ops.c | |
| parent | 7aa1c544f73e430ee50849cabd31a59b5acbf4de (diff) | |
| parent | 51ead449f7b7e08051f9eaff7aabda32a87cc2db (diff) | |
Merge branch 'npr_tess' of https://github.com/DarkDefender/blender into soc-2018-npr
# Conflicts:
# release/scripts/addons
# release/scripts/addons_contrib
# source/blender/editors/space_outliner/outliner_draw.c
# source/blender/makesdna/DNA_scene_types.h
# source/blender/modifiers/intern/MOD_mybmesh.c
# source/tools
Diffstat (limited to 'source/blender/editors/mesh/mesh_ops.c')
| -rw-r--r-- | source/blender/editors/mesh/mesh_ops.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c index fbdd44c9b9b..ce8b62a1f59 100644 --- a/source/blender/editors/mesh/mesh_ops.c +++ b/source/blender/editors/mesh/mesh_ops.c @@ -40,6 +40,7 @@ #include "ED_object.h" #include "ED_mesh.h" #include "ED_screen.h" +#include "ED_select_utils.h" #include "mesh_intern.h" /* own include */ |