[Bf-blender-cvs] [de7b114] temp_depsgraph_split_ubereval: Simplify initialization of the deformedVerts variable.

[Lukas Tönne]

Commit: de7b114eb7a9830c3d35aa583fce05dcc0fe2ae1
Author: Lukas Tönne
Date:   Thu Sep 24 11:26:00 2015 +0200
Branches: temp_depsgraph_split_ubereval
https://developer.blender.org/rBde7b114eb7a9830c3d35aa583fce05dcc0fe2ae1

Simplify initialization of the deformedVerts variable.

No need to do the same thing in both code branches, the result is the same.

===================================================================

M	source/blender/blenkernel/intern/DerivedMesh.c

===================================================================

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index cf4e183..acbe020 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -1869,7 +1869,7 @@ static void mesh_calc_modifiers(
 	Mesh *me = ob->data;
 	ModifierEvalContext ctx;
 	ModifierEvalIterator iter;
-	float (*deformedVerts)[3] = NULL;
+	float (*deformedVerts)[3] = inputVertexCos;
 	DerivedMesh *dm = NULL, *orcodm, *clothorcodm, *finaldm;
 	int numVerts = me->totvert;
 
@@ -1891,9 +1891,6 @@ static void mesh_calc_modifiers(
 	*r_final = NULL;
 
 	if (useDeform) {
-		if (inputVertexCos)
-			deformedVerts = inputVertexCos;
-		
 		/* Apply all leading deforming modifiers */
 		for (; iter.modifier; iter.modifier = iter.modifier->next, iter.datamask = iter.datamask->next) {
 			ModifierData *md = iter.modifier;
@@ -1941,9 +1938,7 @@ static void mesh_calc_modifiers(
 	}
 	else {
 		/* default behavior for meshes */
-		if (inputVertexCos)
-			deformedVerts = inputVertexCos;
-		else
+		if (!deformedVerts)
 			deformedVerts = BKE_mesh_vertexCos_get(me, &numVerts);
 	}