mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed merge

Browse Source
This commit is contained in:
Christophe Riccio
2011-08-28 19:56:58 +01:00
parent 24598c38cd 317a14aadd
commit 8eee19e183
4 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
glm/gtc/quaternion.inl
View File

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