Merge branch '0.9.2' of ssh://g-truc.git.sourceforge.net/gitroot/ogl-math/ogl-math into 0.9.2

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
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////

glm/gtc/quaternion.inl

@@ -147,6 +147,20 @@ namespace detail{
     //////////////////////////////////////////////////////////////
     // tquat<valType> external operators
 
+    template <typename T> 
+    GLM_FUNC_QUALIFIER detail::tquat<T> operator*
+    ( 
+        detail::tquat<T> const & q, 
+        detail::tquat<T> const & p
+    ) 
+    { 
+        return detail::tquat<T>(
+            q.w + p.w,
+            q.x + p.x,
+            q.y + p.y,
+            q.z + p.z);
+    } 
+
 	template <typename T>
 	GLM_FUNC_QUALIFIER detail::tquat<T> operator- 
 	(

glm/gtx/integer.inl

@@ -49,9 +49,10 @@ namespace integer
 	template <typename genType>
     GLM_FUNC_QUALIFIER genType factorial(genType const & x)
     {
+		genType Temp = x;
         genType Result;
-        for(Result = 1; x > 1; --x)
+        for(Result = 1; Temp > 1; --Temp)
-            Result *= x;
+            Result *= Temp;
         return Result;
     }