diff options
| author | Luca Rood <dev@lucarood.com> | 2017-07-04 11:12:09 +0300 |
|---|---|---|
| committer | Luca Rood <dev@lucarood.com> | 2017-07-04 13:27:21 +0300 |
| commit | d1dfd5fa26d89e40ecbf39b9ac921d341f8fdc41 (patch) | |
| tree | 18984d694e675d84df73fe4effecab65ded3e259 /source/blender/editors/transform | |
| parent | b87d10d4fe4df2d87d3acdd366f4bd5e2d1350fb (diff) | |
Fix T51703: Rigid body with delta transform jumps when transforming
When doing any transformation on a rigid body object that has delta
transforms, the object would be offset by the amount of the delta
transform.
Diffstat (limited to 'source/blender/editors/transform')
| -rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index ba474e93b70..1eb9b3caa3e 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -5349,7 +5349,8 @@ static void ObjectToTransData(TransInfo *t, TransData *td, Object *ob) } /* update object's loc/rot to get current rigid body transform */ mat4_to_loc_rot_size(ob->loc, rot, scale, ob->obmat); - BKE_object_mat3_to_rot(ob, rot, false); + sub_v3_v3(ob->loc, ob->dloc); + BKE_object_mat3_to_rot(ob, rot, false); /* drot is already corrected here */ } } |