Merge branch 'master' into blender2.8

2017-04-24 22:11:05 +10:00
parent f93f4169cb aff30aaf2d
commit 2010dbe8a5
29 changed files with 780 additions and 553 deletions
--- a/source/blender/modifiers/intern/MOD_surfacedeform.c
+++ b/source/blender/modifiers/intern/MOD_surfacedeform.c
@@ -1135,9 +1135,11 @@ static void surfacedeformModifier_do(ModifierData *md, float (*vertexCos)[3], un
 	}

 	/* Actual vertex location update starts here */
-	SDefDeformData data = {.bind_verts = smd->verts,
-		                   .targetCos = MEM_mallocN(sizeof(float[3]) * tnumverts, "SDefTargetVertArray"),
-		                   .vertexCos = vertexCos};
+	SDefDeformData data = {
+		.bind_verts = smd->verts,
+		.targetCos = MEM_mallocN(sizeof(float[3]) * tnumverts, "SDefTargetVertArray"),
+		.vertexCos = vertexCos,
+	};

 	if (data.targetCos != NULL) {
 		bool tdm_vert_alloc;