diff options
| author | James McLean <james@mcleanlabs.ca> | 2015-06-11 13:44:04 -0400 |
|---|---|---|
| committer | James McLean <james@mcleanlabs.ca> | 2015-06-11 13:44:04 -0400 |
| commit | c2181285eb225065a9b72f473c7a7a24949a7fe2 (patch) | |
| tree | 5234148aab377ff406a7714f3218163caa1c2e2a /core/math | |
| parent | 237d6afa1602c414390e8f008580d288c3c7e694 (diff) | |
Changed 'scale' to 'scale_basis' in 'interpolate_with'.
Diffstat (limited to 'core/math')
| -rw-r--r-- | core/math/math_2d.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/math/math_2d.cpp b/core/math/math_2d.cpp index 185241e90f..cdb9363b9d 100644 --- a/core/math/math_2d.cpp +++ b/core/math/math_2d.cpp @@ -655,7 +655,7 @@ Matrix32 Matrix32::interpolate_with(const Matrix32& p_transform, float p_c) cons //construct matrix Matrix32 res(Math::atan2(v.y, v.x), Vector2::linear_interpolate(p1, p2, p_c)); - res.scale(Vector2::linear_interpolate(s1, s2, p_c)); + res.scale_basis(Vector2::linear_interpolate(s1, s2, p_c)); return res; } |