mewin/glm
1
0
Fork 0
Code Releases Activity

Merge branch '0.9.3' into 0.9.4

Browse Source
This commit is contained in:
Christophe Riccio
2012-06-30 01:11:36 +01:00
parent 4797b4922a ac8ec9b97c
commit 35995e40f0
8 changed files with 47 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
glm/gtc/half_float.hpp
View File

@@ -47,7 +47,7 @@
namespace glm{
namespace detail
{
#if(!GLM_SUPPORT_ANONYMOUS_UNION_OF_STRUCTURE())
#if(GLM_COMPONENT == GLM_COMPONENT_CXX98)
template <>
struct tvec2<half>
{
@@ -345,7 +345,7 @@ namespace detail
tvec4<half> swizzle(comp X, comp Y, comp Z, comp W) const;
tref4<half> swizzle(comp X, comp Y, comp Z, comp W);
};
#endif//(!GLM_SUPPORT_ANONYMOUS_UNION_OF_STRUCTURE())
#endif//(GLM_COMPONENT == GLM_COMPONENT_CXX98)
}
//namespace detail

4
glm/gtc/half_float.inl
View File

@@ -29,7 +29,7 @@
namespace glm{
namespace detail
{
#if(!GLM_SUPPORT_ANONYMOUS_UNION_OF_STRUCTURE())
#if(GLM_COMPONENT == GLM_COMPONENT_CXX98)
//////////////////////////////////////
// hvec2
@@ -1003,7 +1003,7 @@ namespace detail
(*this)[w]);
}
#endif//(!GLM_SUPPORT_ANONYMOUS_UNION_OF_STRUCTURE())
#endif//(GLM_COMPONENT == GLM_COMPONENT_CXX98)
}//namespace detail
}//namespace glm