[Bf-blender-cvs] [c80c596] master: Fix for mesh deform modifier missing copy for flag.

Campbell Barton noreply at git.blender.org
Sat Dec 21 18:45:48 CET 2013


Commit: c80c596194b998bd7cd5ba4ec0eb764e19d323b4
Author: Campbell Barton
Date:   Sun Dec 22 04:45:00 2013 +1100
http://developer.blender.org/rBc80c596194b998bd7cd5ba4ec0eb764e19d323b4

Fix for mesh deform modifier missing copy for flag.

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

M	source/blender/makesdna/DNA_modifier_types.h
M	source/blender/modifiers/intern/MOD_meshdeform.c

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

diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index b3c7427..a3792e9 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -603,7 +603,7 @@ typedef struct MeshDeformModifierData {
 	struct Object *object;          /* mesh object */
 	char defgrp_name[64];           /* optional vertexgroup name, MAX_VGROUP_NAME */
 
-	short gridsize, flag, mode, pad;
+	short gridsize, flag, pad[2];
 
 	/* result of static binding */
 	MDefInfluence *bindinfluences;  /* influences */
@@ -614,7 +614,7 @@ typedef struct MeshDeformModifierData {
 	/* result of dynamic binding */
 	MDefCell *dyngrid;              /* grid with dynamic binding cell points */
 	MDefInfluence *dyninfluences;   /* dynamic binding vertex influences */
-	int *dynverts, *pad2;           /* is this vertex bound or not? */
+	int *dynverts;                  /* is this vertex bound or not? */
 	int dyngridsize;                /* size of the dynamic bind grid */
 	int totinfluence;               /* total number of vertex influences */
 	float dyncellmin[3];            /* offset of the dynamic bind grid */
diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c b/source/blender/modifiers/intern/MOD_meshdeform.c
index e540d5c..61dcc1f 100644
--- a/source/blender/modifiers/intern/MOD_meshdeform.c
+++ b/source/blender/modifiers/intern/MOD_meshdeform.c
@@ -82,6 +82,7 @@ static void copyData(ModifierData *md, ModifierData *target)
 	MeshDeformModifierData *tmmd = (MeshDeformModifierData *) target;
 
 	tmmd->gridsize = mmd->gridsize;
+	tmmd->flag = mmd->flag;
 	tmmd->object = mmd->object;
 }




More information about the Bf-blender-cvs mailing list