mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-23 01:14:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Christophe Riccio 2010-08-26 11:35:10 +01:00
commit a8f4b26f83
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glm/core/type_mat3x4.inl
View File

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

2
glm/setup.hpp
View File

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