Merge branch 'master' into blender2.8

2017-09-14 16:16:14 +05:00
parent 5ae63f03d9 09c6c6c486
commit 75f36266df
16 changed files with 304 additions and 98 deletions
--- a/source/blender/modifiers/intern/MOD_boolean.c
+++ b/source/blender/modifiers/intern/MOD_boolean.c
@@ -228,7 +228,7 @@ static DerivedMesh *applyModifier_bmesh(

 				looptris = MEM_mallocN(sizeof(*looptris) * looptris_tot, __func__);

-				BM_mesh_calc_tessellation(bm, looptris, &tottri);
+				BM_mesh_calc_tessellation_beauty(bm, looptris, &tottri);

 				/* postpone this until after tessellating
 				 * so we can use the original normals before the vertex are moved */