diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-04-18 13:55:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-18 13:55:35 +0200 |
| commit | 30181322447ed02baccc1c9494a8373be5459134 (patch) | |
| tree | 197315b92ad85383ffa959686e376a364ad84a29 /core/math/transform.cpp | |
| parent | 9a4110a451cabd4476882ce202b2568874f98e16 (diff) | |
| parent | a5e0bb447c339365d99dba772ea733c997c21200 (diff) | |
| download | redot-engine-30181322447ed02baccc1c9494a8373be5459134.tar.gz | |
Merge pull request #18204 from tagcup/quat_scale
Avoid converting Quat to Euler angles when not necessary.
Diffstat (limited to 'core/math/transform.cpp')
| -rw-r--r-- | core/math/transform.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/math/transform.cpp b/core/math/transform.cpp index f727d00e30..7cd186ca60 100644 --- a/core/math/transform.cpp +++ b/core/math/transform.cpp @@ -119,11 +119,11 @@ Transform Transform::interpolate_with(const Transform &p_transform, real_t p_c) /* not sure if very "efficient" but good enough? */ - Vector3 src_scale = basis.get_signed_scale(); + Vector3 src_scale = basis.get_scale(); Quat src_rot = basis.orthonormalized(); Vector3 src_loc = origin; - Vector3 dst_scale = p_transform.basis.get_signed_scale(); + Vector3 dst_scale = p_transform.basis.get_scale(); Quat dst_rot = p_transform.basis; Vector3 dst_loc = p_transform.origin; |