diff --git a/doc/glm-0.9.2.pdf b/doc/glm-0.9.2.pdf index 390ae0aa..8cd8b88e 100644 Binary files a/doc/glm-0.9.2.pdf and b/doc/glm-0.9.2.pdf differ diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp index 38192aa5..329a8e22 100644 --- a/glm/core/setup.hpp +++ b/glm/core/setup.hpp @@ -17,7 +17,7 @@ #define GLM_VERSION_MAJOR 0 #define GLM_VERSION_MINOR 9 #define GLM_VERSION_PATCH 2 -#define GLM_VERSION_REVISION 1 +#define GLM_VERSION_REVISION 2 /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/glm/gtc/quaternion.inl b/glm/gtc/quaternion.inl index e262c663..df92920a 100644 --- a/glm/gtc/quaternion.inl +++ b/glm/gtc/quaternion.inl @@ -147,6 +147,20 @@ namespace detail{ ////////////////////////////////////////////////////////////// // tquat external operators + template + GLM_FUNC_QUALIFIER detail::tquat operator* + ( + detail::tquat const & q, + detail::tquat const & p + ) + { + return detail::tquat( + q.w + p.w, + q.x + p.x, + q.y + p.y, + q.z + p.z); + } + template GLM_FUNC_QUALIFIER detail::tquat operator- ( diff --git a/glm/gtx/integer.inl b/glm/gtx/integer.inl index aef659e0..e9c93c0f 100644 --- a/glm/gtx/integer.inl +++ b/glm/gtx/integer.inl @@ -49,9 +49,10 @@ namespace integer template GLM_FUNC_QUALIFIER genType factorial(genType const & x) { + genType Temp = x; genType Result; - for(Result = 1; x > 1; --x) - Result *= x; + for(Result = 1; Temp > 1; --Temp) + Result *= Temp; return Result; }