diff options
author | Jacques Lucke <jacques@blender.org> | 2020-09-15 13:43:00 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-09-15 13:43:15 +0300 |
commit | 271f64e3588b76828e346ab8255e722c981a3d3f (patch) | |
tree | a010941f3ad3df63c73a0eeca705f4e6a5132997 /source/blender | |
parent | 7b66c719aefde816e6159d058db45a697daa5ec8 (diff) |
Fix T54293: calculate mass does not take object scale into account
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/rigidbody.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c index 0a31af032d3..6b2b7271c76 100644 --- a/source/blender/blenkernel/intern/rigidbody.c +++ b/source/blender/blenkernel/intern/rigidbody.c @@ -708,6 +708,8 @@ void BKE_rigidbody_calc_volume(Object *ob, float *r_vol) if (totvert > 0 && tottri > 0) { BKE_mesh_calc_volume(mvert, totvert, lt, tottri, mloop, &volume, NULL); + const float volume_scale = mat4_to_volume_scale(ob->obmat); + volume *= fabsf(volume_scale); } } else { |