aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Tony Wasserka <neobrainx@gmail.com>2015-02-17 00:30:22 +0100
committerGravatar Tony Wasserka <neobrainx@gmail.com>2015-02-17 00:30:22 +0100
commita78b8b1bc409cb78f06a45e26d3f9ac3767fb907 (patch)
treeb4c01135a95e292f747794ab4f2d1779b74e7b54
parentd57eb210a020297bd4dc3b5862a6cd87c77e78fc (diff)
parent8a1c08a0af38a9b2dc768f0d695cb8ed2d680fdd (diff)
Merge pull request #578 from linkmauve/math-typo
VideoCore: Fix a typo in Vec4 MakeVec(T, Vec3<T>), where the second argument was Vec2<T> instead
-rw-r--r--src/video_core/math.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_core/math.h b/src/video_core/math.h
index c176b225..f9a82265 100644
--- a/src/video_core/math.h
+++ b/src/video_core/math.h
@@ -631,7 +631,7 @@ static inline Vec4<T> MakeVec(const Vec3<T>& xyz, const T& w)
}
template<typename T>
-static inline Vec4<T> MakeVec(const T& x, const Vec2<T>& yzw)
+static inline Vec4<T> MakeVec(const T& x, const Vec3<T>& yzw)
{
return MakeVec(x, yzw[0], yzw[1], yzw[2]);
}