Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #20383: mesh deform modifier wasn't working on lattices.

Browse Source
This commit is contained in:
Brecht Van Lommel
2010-07-05 11:48:13 +00:00
parent 462d889720
commit 052ab934aa
5 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/armature/meshlaplacian.c
View File

@@ -1922,7 +1922,7 @@ static void heat_weighting_bind(Scene *scene, DerivedMesh *dm, MeshDeformModifie
} }
#endif #endif
void mesh_deform_bind(Scene *scene, DerivedMesh *dm, MeshDeformModifierData *mmd, float *vertexcos, int totvert, float cagemat[][4]) void mesh_deform_bind(Scene *scene, MeshDeformModifierData *mmd, float *vertexcos, int totvert, float cagemat[][4])
{ {
MeshDeformBind mdb; MeshDeformBind mdb;
MVert *mvert; MVert *mvert;

2
source/blender/editors/armature/meshlaplacian.h
View File

@@ -78,7 +78,7 @@ void rigid_deform_end(int cancel);
/* Harmonic Coordinates */ /* Harmonic Coordinates */
void mesh_deform_bind(struct Scene *scene, struct DerivedMesh *dm, void mesh_deform_bind(struct Scene *scene,
struct MeshDeformModifierData *mmd, struct MeshDeformModifierData *mmd,
float *vertexcos, int totvert, float cagemat[][4]); float *vertexcos, int totvert, float cagemat[][4]);

2
source/blender/editors/include/ED_armature.h
View File

@@ -165,7 +165,7 @@ void BDR_drawSketch(const struct bContext *vc);
int BDR_drawSketchNames(struct ViewContext *vc); int BDR_drawSketchNames(struct ViewContext *vc);
/* meshlaplacian.c */ /* meshlaplacian.c */
void mesh_deform_bind(struct Scene *scene, struct DerivedMesh *dm, void mesh_deform_bind(struct Scene *scene,
struct MeshDeformModifierData *mmd, struct MeshDeformModifierData *mmd,
float *vertexcos, int totvert, float cagemat[][4]); float *vertexcos, int totvert, float cagemat[][4]);

2
source/blender/makesdna/DNA_modifier_types.h
View File

@@ -538,7 +538,7 @@ typedef struct MeshDeformModifierData {
float *bindcos; /* deprecated storage of cage coords */ float *bindcos; /* deprecated storage of cage coords */
/* runtime */ /* runtime */
void (*bindfunc)(struct Scene *scene, struct DerivedMesh *dm, void (*bindfunc)(struct Scene *scene,
struct MeshDeformModifierData *mmd, struct MeshDeformModifierData *mmd,
float *vertexcos, int totvert, float cagemat[][4]); float *vertexcos, int totvert, float cagemat[][4]);
} MeshDeformModifierData; } MeshDeformModifierData;

18
source/blender/modifiers/intern/MOD_meshdeform.c
View File

@@ -227,7 +227,7 @@ static void meshdeformModifier_do(
/* progress bar redraw can make this recursive .. */ /* progress bar redraw can make this recursive .. */
if(!recursive) { if(!recursive) {
recursive = 1; recursive = 1;
mmd->bindfunc(md->scene, dm, mmd, (float*)vertexCos, numVerts, cagemat); mmd->bindfunc(md->scene, mmd, (float*)vertexCos, numVerts, cagemat);
recursive = 0; recursive = 0;
} }
} }
@@ -275,7 +275,7 @@ static void meshdeformModifier_do(
defgrp_index = defgroup_name_index(ob, mmd->defgrp_name); defgrp_index = defgroup_name_index(ob, mmd->defgrp_name);
if (defgrp_index >= 0) if(dm && defgrp_index >= 0)
dvert= dm->getVertDataArray(dm, CD_MDEFORMVERT); dvert= dm->getVertDataArray(dm, CD_MDEFORMVERT);
/* do deformation */ /* do deformation */
@@ -343,14 +343,11 @@ static void deformVerts(
{ {
DerivedMesh *dm= get_dm(md->scene, ob, NULL, derivedData, NULL, 0);; DerivedMesh *dm= get_dm(md->scene, ob, NULL, derivedData, NULL, 0);;
if(!dm)
return;
modifier_vgroup_cache(md, vertexCos); /* if next modifier needs original vertices */ modifier_vgroup_cache(md, vertexCos); /* if next modifier needs original vertices */
meshdeformModifier_do(md, ob, dm, vertexCos, numVerts); meshdeformModifier_do(md, ob, dm, vertexCos, numVerts);
if(dm != derivedData) if(dm && dm != derivedData)
dm->release(dm); dm->release(dm);
} }
@@ -358,16 +355,11 @@ static void deformVertsEM(
ModifierData *md, Object *ob, struct EditMesh *editData, ModifierData *md, Object *ob, struct EditMesh *editData,
DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts)
{ {
DerivedMesh *dm; DerivedMesh *dm= get_dm(md->scene, ob, NULL, derivedData, NULL, 0);;
if(!derivedData && ob->type == OB_MESH)
dm = CDDM_from_editmesh(editData, ob->data);
else
dm = derivedData;
meshdeformModifier_do(md, ob, dm, vertexCos, numVerts); meshdeformModifier_do(md, ob, dm, vertexCos, numVerts);
if(dm != derivedData) if(dm && dm != derivedData)
dm->release(dm); dm->release(dm);
} }