diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-01-26 17:08:19 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-01-26 17:08:19 +0300 |
| commit | 058f68de10379a041ac4f229d5d75d3b0c9c59a9 (patch) | |
| tree | 1c6c416d53e7773158f2cda3c67eadbcfba24782 /source/blender/editors/armature | |
| parent | 641774436f08f067939c9d854187da51e12c2454 (diff) | |
Fix #20049: mdef binding wasn't working correct since raytrace optimization.
Diffstat (limited to 'source/blender/editors/armature')
| -rw-r--r-- | source/blender/editors/armature/meshlaplacian.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c index 2ad71881f47..c8bdae53a11 100644 --- a/source/blender/editors/armature/meshlaplacian.c +++ b/source/blender/editors/armature/meshlaplacian.c @@ -1166,7 +1166,7 @@ static int meshdeform_intersect(MeshDeformBind *mdb, Isect *isec) mface= mdb->cagedm->getFaceArray(mdb->cagedm); totface= mdb->cagedm->getNumFaces(mdb->cagedm); - VECADDFAC( end, isec->start, isec->vec, isec->labda ); + add_v3_v3v3(end, isec->start, isec->vec); for(f=0; f<totface; f++, mface++) { copy_v3_v3(face[0], mdb->cagecos[mface->v1]); @@ -1670,7 +1670,6 @@ static void meshdeform_matrix_solve(MeshDeformBind *mdb) for(b=0; b<mdb->totvert; b++) { if(mdb->inside[b]) { copy_v3_v3(vec, mdb->vertexcos[b]); - mul_m4_v3(mdb->cagemat, vec); gridvec[0]= (vec[0] - mdb->min[0] - mdb->halfwidth[0])/mdb->width[0]; gridvec[1]= (vec[1] - mdb->min[1] - mdb->halfwidth[1])/mdb->width[1]; gridvec[2]= (vec[2] - mdb->min[2] - mdb->halfwidth[2])/mdb->width[2]; @@ -1781,7 +1780,6 @@ static void harmonic_coordinates_bind(Scene *scene, MeshDeformModifierData *mmd, totinside= 0; for(a=0; a<mdb->totvert; a++) { copy_v3_v3(vec, mdb->vertexcos[a]); - mul_m4_v3(mdb->cagemat, vec); mdb->inside[a]= meshdeform_inside_cage(mdb, vec); if(mdb->inside[a]) totinside++; |