Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / transform / transform_conversions.c
index 2b25581e2b34c3a27348d719dab2ad54a05502d6..cfc648e1fd03e08d7f9f4f108baf3bb47bc17a08 100644 (file)
@@ -5333,7 +5333,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 */
                }
        }