merge with trunk at r31523

1 files changed, 3 insertions, 2 deletions

diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c b/source/blender/modifiers/intern/MOD_meshdeform.c
index defc23fc468..b89db2fdc2d 100644
--- a/source/blender/modifiers/intern/MOD_meshdeform.c
+++ b/source/blender/modifiers/intern/MOD_meshdeform.c
@@ -32,6 +32,7 @@
 
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
+#include "DNA_object_types.h"
 
 #include "BLI_math.h"
 
@@ -128,7 +129,7 @@ static float meshdeform_dynamic_bind(MeshDeformModifierData *mmd, float (*dco)[3
 	float weight, cageweight, totweight, *cageco;
 	int i, j, a, x, y, z, size;
 
-	co[0]= co[1]= co[2]= 0.0f;
+	zero_v3(co);
 	totweight= 0.0f;
 	size= mmd->dyngridsize;
 
@@ -313,7 +314,7 @@ static void meshdeformModifier_do(
 		}
 		else {
 			totweight= 0.0f;
-			co[0]= co[1]= co[2]= 0.0f;
+			zero_v3(co);
 
 			for(a=offsets[b]; a<offsets[b+1]; a++) {
 				weight= influences[a].weight;