ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 15:18:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #406 from JoshuaManton/master

Browse Source 
Fix `scale_f32` and `scale_vec3` returning the wrong variable
This commit is contained in:
Mikkel Hjortshøj
2019-07-20 22:21:58 +02:00
committed by GitHub
parent d26033eb23 96f0a08725
commit 5ca0cd60d0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/math/math.odin
+2 -2
View File
@@ -454,7 +454,7 @@ scale_vec3 :: proc(m: Mat4, v: Vec3) -> Mat4 {
mm[0][0] *= v[0]; mm[0][0] *= v[0];
mm[1][1] *= v[1]; mm[1][1] *= v[1];
mm[2][2] *= v[2]; mm[2][2] *= v[2];
return m; return mm;
} }
scale_f32 :: proc(m: Mat4, s: f32) -> Mat4 { 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[0][0] *= s;
mm[1][1] *= s; mm[1][1] *= s;
mm[2][2] *= s; mm[2][2] *= s;
return m; return mm;
} }
scale :: proc{scale_vec3, scale_f32}; scale :: proc{scale_vec3, scale_f32};