mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed C++11 explicit conversion operators detection #282

Browse Source
This commit is contained in:
Christophe Riccio
2014-12-03 21:48:41 +01:00
parent 6a1a673b41
commit 38d99978ab
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
glm/gtc/quaternion.inl
View File

@@ -190,7 +190,8 @@ namespace detail
{
*this = quat_cast(m);
}
# if GLM_HAS_EXPLICIT_CONVERSION_OPERATORS
template <typename T, precision P>
GLM_FUNC_QUALIFIER tquat<T, P>::operator tmat3x3<T, P>()
{
@@ -202,6 +203,7 @@ namespace detail
{
return mat4_cast(*this);
}
# endif//GLM_HAS_EXPLICIT_CONVERSION_OPERATORS
template <typename T, precision P>
GLM_FUNC_QUALIFIER tquat<T, P> conjugate(tquat<T, P> const & q)