Browse Source

Merge branch '0.8.4' of ../ogl-math-0.8.4 into 0.9.0

Christophe Riccio 15 years ago
parent
commit
f0f4dadd9d
1 changed files with 1 additions and 1 deletions
  1. 1 1
      glm/gtc/quaternion.inl

+ 1 - 1
glm/gtc/quaternion.inl

@@ -451,7 +451,7 @@ namespace quaternion{
             Result.w = (m[1][2] - m[2][1]) * mult;
             Result.w = (m[1][2] - m[2][1]) * mult;
             Result.x = biggestVal;
             Result.x = biggestVal;
             Result.y = (m[0][1] + m[1][0]) * mult;
             Result.y = (m[0][1] + m[1][0]) * mult;
-            Result.z = (m[2][1] + m[1][2]) * mult;
+            Result.z = (m[2][0] + m[0][2]) * mult;
             break;
             break;
         case 2:
         case 2:
             Result.w = (m[2][0] - m[0][2]) * mult;
             Result.w = (m[2][0] - m[0][2]) * mult;