From d1dfd5fa26d89e40ecbf39b9ac921d341f8fdc41 Mon Sep 17 00:00:00 2001 From: Luca Rood Date: Tue, 4 Jul 2017 10:12:09 +0200 Subject: 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. --- source/blender/editors/transform/transform_conversions.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/transform') 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 */ } } -- cgit v1.2.3