diff options
author | Pratik Borhade <PratikPB2123> | 2022-06-27 16:37:09 +0300 |
---|---|---|
committer | Philipp Oeser <info@graphics-engineer.com> | 2022-10-03 21:48:39 +0300 |
commit | 4b3b8156ee443decdd224a99bb4fac69afb0f4f9 (patch) | |
tree | d09c323dfec4b16a1dc1a8f7b8607e2dfc0d89d6 | |
parent | 8c148a4f3b8f3c74c18b40340462de00ebdc9cec (diff) |
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
-rw-r--r-- | source/blender/editors/object/object_transform.c | 7 |
1 files changed, 5 insertions, 2 deletions
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); } |