diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-03-02 06:09:27 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-02 06:09:27 +0300 |
| commit | 4913e47aa0107cbe1daf06e8020a60916ea883a3 (patch) | |
| tree | 29cf5e0671027f74296d866cff0df66267bd09c8 /source/blender/blenkernel/intern/constraint.c | |
| parent | b7016e69b3fff44d623f8413f9ebd4f7216a9b9b (diff) | |
| parent | 7e4c23e4d7a3a27a49930824c822b679416724f6 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/constraint.c')
| -rw-r--r-- | source/blender/blenkernel/intern/constraint.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index b8dc7944a75..f0e60296119 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -1929,16 +1929,16 @@ static void samevolume_evaluate(bConstraint *con, bConstraintOb *cob, ListBase * /* apply scaling factor to the channels not being kept */ switch (data->flag) { case SAMEVOL_X: - mul_v3_fl(cob->matrix[1], fac); - mul_v3_fl(cob->matrix[2], fac); + mul_v3_fl(cob->matrix[1], fac / obsize[1]); + mul_v3_fl(cob->matrix[2], fac / obsize[2]); break; case SAMEVOL_Y: - mul_v3_fl(cob->matrix[0], fac); - mul_v3_fl(cob->matrix[2], fac); + mul_v3_fl(cob->matrix[0], fac / obsize[0]); + mul_v3_fl(cob->matrix[2], fac / obsize[2]); break; case SAMEVOL_Z: - mul_v3_fl(cob->matrix[0], fac); - mul_v3_fl(cob->matrix[1], fac); + mul_v3_fl(cob->matrix[0], fac / obsize[0]); + mul_v3_fl(cob->matrix[1], fac / obsize[1]); break; } } |