diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-07-26 10:37:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-26 10:37:03 +0200 |
| commit | 5c8919aac6877f49f8a113557b2e87422eda72c9 (patch) | |
| tree | c9c4a172091f48e22fbd931a86cd1139d9a19611 /core/math/matrix3.cpp | |
| parent | eab105310b6722684d48bc0fe944fccc9392a26d (diff) | |
| parent | 1bba6eeeb9f0898308e5b96f6f996c2fbabe55ee (diff) | |
| download | redot-engine-5c8919aac6877f49f8a113557b2e87422eda72c9.tar.gz | |
Merge pull request #18955 from tagcup/fix_set_scale
Removed incorrect Basis::set_scale().
Diffstat (limited to 'core/math/matrix3.cpp')
| -rw-r--r-- | core/math/matrix3.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/core/math/matrix3.cpp b/core/math/matrix3.cpp index 2371f49561..7db41756ed 100644 --- a/core/math/matrix3.cpp +++ b/core/math/matrix3.cpp @@ -242,18 +242,11 @@ void Basis::scale_local(const Vector3 &p_scale) { Basis Basis::scaled_local(const Vector3 &p_scale) const { Basis b; - b.set_scale(p_scale); + b.set_diagonal(p_scale); return (*this) * b; } -void Basis::set_scale(const Vector3 &p_scale) { - - set_axis(0, get_axis(0).normalized() * p_scale.x); - set_axis(1, get_axis(1).normalized() * p_scale.y); - set_axis(2, get_axis(2).normalized() * p_scale.z); -} - Vector3 Basis::get_scale_abs() const { return Vector3( |