Merge branch 'master' into blender2.8

2018-05-08 19:09:35 +02:00 · 2018-05-08 19:09:35 +02:00 · 6e88075618
parent 9a055d1abc e0a436fcff
commit 6e88075618
3 changed files with 1073 additions and 1029 deletions
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@ -139,6 +139,7 @@ set(SRC
 	intern/mball.c
 	intern/mball_tessellate.c
 	intern/mesh.c
+	intern/mesh_convert.c
 	intern/mesh_evaluate.c
 	intern/mesh_mapping.c
 	intern/mesh_merge.c
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
--- a/source/blender/blenkernel/intern/mesh_convert.c
+++ b/source/blender/blenkernel/intern/mesh_convert.c