mewin/glm
1
0
Fork 0
Code Releases Activity

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

Browse Source
This commit is contained in:
Christophe Riccio 2011-08-28 01:54:31 +01:00
commit 317a14aadd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glm/core/_detail.hpp
View File

@ -18,7 +18,7 @@ namespace detail
{ {
class thalf; class thalf;
#if(__STDC_VERSION__ && (__STDC_VERSION__ >= 199901L)) // C99 detected, 64 bit types available #if(defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) // C99 detected, 64 bit types available
typedef int64_t sint64; typedef int64_t sint64;
typedef uint64_t uint64; typedef uint64_t uint64;
#elif(GLM_COMPILER & GLM_COMPILER_VC) #elif(GLM_COMPILER & GLM_COMPILER_VC)

4
glm/gtc/quaternion.inl
View File

@ -88,7 +88,7 @@ namespace detail{
tmat3x3<T> const & m tmat3x3<T> const & m
) )
{ {
*this = toQuat(m); *this = gtc::quaternion::quat_cast(m);
} }
template <typename T> template <typename T>
@ -97,7 +97,7 @@ namespace detail{
tmat4x4<T> const & m tmat4x4<T> const & m
) )
{ {
*this = toQuat(m); *this = gtc::quaternion::quat_cast(m);
} }
////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////