From 1318f942cfbe6576cdda1422e8cc234469447cbe Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 2 Jan 2017 21:24:13 +0100 Subject: [PATCH] Fixed build --- glm/gtx/matrix_interpolation.inl | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/glm/gtx/matrix_interpolation.inl b/glm/gtx/matrix_interpolation.inl index dd4e7d7d..8e99ac4d 100644 --- a/glm/gtx/matrix_interpolation.inl +++ b/glm/gtx/matrix_interpolation.inl @@ -94,22 +94,20 @@ namespace glm t * n.x * n.x + c, t * n.x * n.y + n.z * s, t * n.x * n.z - n.y * s, T(0), t * n.x * n.y - n.z * s, t * n.y * n.y + c, t * n.y * n.z + n.x * s, T(0), t * n.x * n.z + n.y * s, t * n.y * n.z - n.x * s, t * n.z * n.z + c, T(0), - T(0), T(0), T(0), T(1) - ); + T(0), T(0), T(0), T(1)); } template GLM_FUNC_QUALIFIER mat<4, 4, T, P> extractMatrixRotation ( - mat<4, 4, T, P> const& mat + mat<4, 4, T, P> const& m ) { return mat<4, 4, T, P>( - mat[0][0], mat[0][1], mat[0][2], 0.0, - mat[1][0], mat[1][1], mat[1][2], 0.0, - mat[2][0], mat[2][1], mat[2][2], 0.0, - 0.0, 0.0, 0.0, 1.0 - ); + m[0][0], m[0][1], m[0][2], 0.0, + m[1][0], m[1][1], m[1][2], 0.0, + m[2][0], m[2][1], m[2][2], 0.0, + 0.0, 0.0, 0.0, 1.0); } template