[Bf-blender-cvs] [4b3b8156ee4] blender-v2.93-release: Fix T99070: Apply transform fails to clear delta transform values

[Pratik Borhade]

Commit: 4b3b8156ee443decdd224a99bb4fac69afb0f4f9
Author: Pratik Borhade
Date:   Mon Jun 27 10:37:09 2022 -0300
Branches: blender-v2.93-release
https://developer.blender.org/rB4b3b8156ee443decdd224a99bb4fac69afb0f4f9

Fix T99070: Apply transform fails to clear delta transform values

Clear delta transform value after applying transform.
Include delta location while applying transform.
Use `copy_v3_fl` for resetting object scale

Reviewed By: mano-wii

Maniphest Tasks: T99070

Differential Revision: https://developer.blender.org/D15270

===================================================================

M	source/blender/editors/object/object_transform.c

===================================================================

diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c
index d7863c54c51..c768ac0696a 100644
--- a/source/blender/editors/object/object_transform.c
+++ b/source/blender/editors/object/object_transform.c
@@ -788,7 +788,7 @@ static int apply_objects_internal(bContext *C,
 
     /* calculate translation */
     if (apply_loc) {
-      copy_v3_v3(mat[3], ob->loc);
+      add_v3_v3v3(mat[3], ob->loc, ob->dloc);
 
       if (!(apply_scale && apply_rot)) {
         float tmat[3][3];
@@ -911,12 +911,15 @@ static int apply_objects_internal(bContext *C,
 
     if (apply_loc) {
       zero_v3(ob->loc);
+      zero_v3(ob->dloc);
     }
     if (apply_scale) {
-      ob->scale[0] = ob->scale[1] = ob->scale[2] = 1.0f;
+      copy_v3_fl(ob->scale, 1.0f);
+      copy_v3_fl(ob->dscale, 1.0f);
     }
     if (apply_rot) {
       zero_v3(ob->rot);
+      zero_v3(ob->drot);
       unit_qt(ob->quat);
       unit_axis_angle(ob->rotAxis, &ob->rotAngle);
     }