diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-01 00:48:48 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-01 00:48:48 +0400 |
| commit | 199efda34e232aba51a264e776ec6fe5a33352b0 (patch) | |
| tree | 59b90680fc49930f2023246f18bfcc58b4e56c7a /source/blender/blenkernel/intern/lattice.c | |
| parent | 8a0a0e3a74a4bbd4161b9bfad79cb6e3350a0ef6 (diff) | |
fix inconsistancy with curve deform bounds being set differently when vertex groups were used.
Diffstat (limited to 'source/blender/blenkernel/intern/lattice.c')
| -rw-r--r-- | source/blender/blenkernel/intern/lattice.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index 12c920059e8..ca2bcb594eb 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -714,10 +714,6 @@ void curve_deform_verts(Scene *scene, Object *cuOb, Object *target, if(cu->flag & CU_DEFORM_BOUNDS_OFF) { - /* dummy bounds */ - cd.dmin[0]= cd.dmin[1]= cd.dmin[2]= 0.0f; - cd.dmax[0]= cd.dmax[1]= cd.dmax[2]= 1.0f; - dvert = me->dvert; for(a = 0; a < numVerts; a++, dvert++) { if(dm) dvert = dm->getVertData(dm, a, CD_MDEFORMVERT); @@ -752,6 +748,7 @@ void curve_deform_verts(Scene *scene, Object *cuOb, Object *target, weight= defvert_find_weight(dvert, index); if(weight > 0.0f) { + /* already in 'cd.curvespace', prev for loop */ copy_v3_v3(vec, vertexCos[a]); calc_curve_deform(scene, cuOb, vec, defaxis, &cd, NULL); interp_v3_v3v3(vertexCos[a], vertexCos[a], vec, weight); @@ -779,6 +776,7 @@ void curve_deform_verts(Scene *scene, Object *cuOb, Object *target, } for(a = 0; a < numVerts; a++) { + /* already in 'cd.curvespace', prev for loop */ calc_curve_deform(scene, cuOb, vertexCos[a], defaxis, &cd, NULL); mul_m4_v3(cd.objectspace, vertexCos[a]); } |