Browse Source

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

Christophe Riccio 15 years ago
parent
commit
a8f4b26f83
2 changed files with 3 additions and 5 deletions
  1. 2 4
      glm/core/type_mat3x4.inl
  2. 1 1
      glm/setup.hpp

+ 2 - 4
glm/core/type_mat3x4.inl

@@ -522,8 +522,7 @@ namespace detail
         return tmat3x4<T>(
             m[0] / s,
             m[1] / s,
-            m[2] / s,
-            m[3] / s);        
+            m[2] / s);        
     }
 
     template <typename T> 
@@ -536,8 +535,7 @@ namespace detail
         return tmat3x4<T>(
             s / m[0],
             s / m[1],
-            s / m[2],
-            s / m[3]);        
+            s / m[2]);        
     }
 
 	// Unary constant operators

+ 1 - 1
glm/setup.hpp

@@ -17,7 +17,7 @@
 #define GLM_VERSION_MAJOR			0
 #define GLM_VERSION_MINOR			9
 #define GLM_VERSION_PATCH			0
-#define GLM_VERSION_REVISION		2
+#define GLM_VERSION_REVISION		3
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Common values