Removed incorrect Basis::set_scale().

Also added a missing constructor in Basis, and fixed usage of inverse and affine inverse in Transform.

1 files changed, 4 insertions, 5 deletions

diff --git a/core/math/transform.cpp b/core/math/transform.cpp
index 7cd186ca60..9c26343f47 100644
--- a/core/math/transform.cpp
+++ b/core/math/transform.cpp
@@ -127,12 +127,11 @@ Transform Transform::interpolate_with(const Transform &p_transform, real_t p_c)
 	Quat dst_rot = p_transform.basis;
 	Vector3 dst_loc = p_transform.origin;
 
-	Transform dst; //this could be made faster by using a single function in Basis..
-	dst.basis = src_rot.slerp(dst_rot, p_c).normalized();
-	dst.basis.set_scale(src_scale.linear_interpolate(dst_scale, p_c));
-	dst.origin = src_loc.linear_interpolate(dst_loc, p_c);
+	Transform interp;
+	interp.basis.set_quat_scale(src_rot.slerp(dst_rot, p_c).normalized(), src_scale.linear_interpolate(dst_scale, p_c));
+	interp.origin = src_loc.linear_interpolate(dst_loc, p_c);
 
-	return dst;
+	return interp;
 }
 
 void Transform::scale(const Vector3 &p_scale) {