diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-09-11 07:00:09 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-09-11 07:00:09 +0400 |
| commit | 2b5f89ed9f66292e3f6736c85d91b85a3c709210 (patch) | |
| tree | 4f370afe8547479dfe62ec3fa38cc25e5c030ac2 /source/blender/blenkernel/intern/lattice.c | |
| parent | fc11700628b56d77cfd57c35c04e07e00d46b10e (diff) | |
| parent | 2fc4ee354574d52200544eec00aed95442cf4d04 (diff) | |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r23043:23119
Diffstat (limited to 'source/blender/blenkernel/intern/lattice.c')
| -rw-r--r-- | source/blender/blenkernel/intern/lattice.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index 67d63d527cb..801511de532 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -364,7 +364,7 @@ void calc_latt_deform(Object *ob, float *co, float weight) u= (vec[0]-lt->fu)/lt->du; ui= (int)floor(u); u -= ui; - set_four_ipo(u, tu, lt->typeu); + key_curve_position_weights(u, tu, lt->typeu); } else { tu[0]= tu[2]= tu[3]= 0.0; tu[1]= 1.0; @@ -375,7 +375,7 @@ void calc_latt_deform(Object *ob, float *co, float weight) v= (vec[1]-lt->fv)/lt->dv; vi= (int)floor(v); v -= vi; - set_four_ipo(v, tv, lt->typev); + key_curve_position_weights(v, tv, lt->typev); } else { tv[0]= tv[2]= tv[3]= 0.0; tv[1]= 1.0; @@ -386,7 +386,7 @@ void calc_latt_deform(Object *ob, float *co, float weight) w= (vec[2]-lt->fw)/lt->dw; wi= (int)floor(w); w -= wi; - set_four_ipo(w, tw, lt->typew); + key_curve_position_weights(w, tw, lt->typew); } else { tw[0]= tw[2]= tw[3]= 0.0; tw[1]= 1.0; |