From d63d803e8f29dd4f2704bf901c7fce58df84d1ad Mon Sep 17 00:00:00 2001 From: Martin Gerhardy Date: Tue, 3 Jan 2017 20:22:54 +0100 Subject: [PATCH] Fixed shadow warnings for quaternions --- glm/gtc/quaternion.inl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glm/gtc/quaternion.inl b/glm/gtc/quaternion.inl index c9b2af73..30699f71 100644 --- a/glm/gtc/quaternion.inl +++ b/glm/gtc/quaternion.inl @@ -117,8 +117,8 @@ namespace detail {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tquat::tquat(T const & w, T const & x, T const & y, T const & z) - : x(x), y(y), z(z), w(w) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR tquat::tquat(T const & _w, T const & _x, T const & _y, T const & _z) + : x(_x), y(_y), z(_z), w(_w) {} // -- Conversion constructors --