diff options
| author | Mikkel Hjortshøj <fyoucon@gmail.com> | 2019-07-20 22:21:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-20 22:21:58 +0200 |
| commit | 5ca0cd60d02226fa6d3dc529182e8fca8de2a4c9 (patch) | |
| tree | 20f72f002eddf5a0bab3cafcb9e51d18c49672cc | |
| parent | d26033eb23c74ae4fc83dc6aaf2f2ec6571f2661 (diff) | |
| parent | 96f0a08725cc8662e94f87ef9b637292b85a5ba4 (diff) | |
Merge pull request #406 from JoshuaManton/master
Fix `scale_f32` and `scale_vec3` returning the wrong variable
| -rw-r--r-- | core/math/math.odin | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/math/math.odin b/core/math/math.odin index 016e8143a..ed04cbfbc 100644 --- a/core/math/math.odin +++ b/core/math/math.odin @@ -454,7 +454,7 @@ scale_vec3 :: proc(m: Mat4, v: Vec3) -> Mat4 { mm[0][0] *= v[0]; mm[1][1] *= v[1]; mm[2][2] *= v[2]; - return m; + return mm; } scale_f32 :: proc(m: Mat4, s: f32) -> Mat4 { @@ -462,7 +462,7 @@ scale_f32 :: proc(m: Mat4, s: f32) -> Mat4 { mm[0][0] *= s; mm[1][1] *= s; mm[2][2] *= s; - return m; + return mm; } scale :: proc{scale_vec3, scale_f32}; |