Merge branch 'master' into blender2.8

2018-05-12 08:21:07 +02:00
parent 1813f00b94 c84b8d4801
commit 4dc91ebf81
55 changed files with 519 additions and 388 deletions
--- a/source/blender/modifiers/intern/MOD_laplaciansmooth.c
+++ b/source/blender/modifiers/intern/MOD_laplaciansmooth.c
@@ -498,8 +498,9 @@ static CustomDataMask required_data_mask(Object *UNUSED(ob), ModifierData *md)
 	return dataMask;
 }

-static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh,
-                        float (*vertexCos)[3], int numVerts)
+static void deformVerts(
+        ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh,
+        float (*vertexCos)[3], int numVerts)
 {
 	Mesh *mesh_src;