diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-22 22:04:35 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-22 22:04:35 +0400 |
| commit | 4966982a5aa7715e6bd67dcef1babdf8ca3d02e9 (patch) | |
| tree | cf96f67b83f89336e3fe2f64aa58345dca818430 /source/blender/blenkernel/intern/constraint.c | |
| parent | 0198df7956125180d5b9c50638a0778a3236d88f (diff) | |
| parent | df51fd74cf826c42a90212082abb27e99484257a (diff) | |
svn merge ^/trunk/blender -r43564:43609
Diffstat (limited to 'source/blender/blenkernel/intern/constraint.c')
| -rw-r--r-- | source/blender/blenkernel/intern/constraint.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 3bcbb782e82..7cdd61e1402 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -2777,13 +2777,14 @@ static void stretchto_evaluate (bConstraint *con, bConstraintOb *cob, ListBase * /* store Z orientation before destroying obmat */ normalize_v3_v3(zz, cob->matrix[2]); - sub_v3_v3v3(vec, cob->matrix[3], ct->matrix[3]); - vec[0] /= size[0]; - vec[1] /= size[1]; - vec[2] /= size[2]; - - dist = normalize_v3(vec); - //dist = len_v3v3( ob->obmat[3], targetmat[3]); + dist = len_v3v3(cob->matrix[3], ct->matrix[3]); + /* XXX What was all that for??? Makes the constraint buggy with scaled objects, see #29940. */ +/* sub_v3_v3v3(vec, cob->matrix[3], ct->matrix[3]);*/ +/* vec[0] /= size[0];*/ +/* vec[1] /= size[1];*/ +/* vec[2] /= size[2];*/ + +/* dist = normalize_v3(vec);*/ /* data->orglength==0 occurs on first run, and after 'R' button is clicked */ if (data->orglength == 0) |