Merge branch '0.9.2' into 0.9.3

2011-05-27 00:38:58 +01:00
parent bf11a54bc8 2305e6b2f0
commit fc8a5d4c0a
5 changed files with 24 additions and 7 deletions
--- a/test/gtc/gtc_quaternion.cpp
+++ b/test/gtc/gtc_quaternion.cpp
@@ -27,7 +27,7 @@ int test_quat_slerp()
    glm::quat B(90.0f, glm::vec3(0, 0, 1));
    glm::quat C = glm::mix(A, B, 0.5f);
    
-    Error += C != glm::quat(45.f, glm::vec3(0, 0, 1)) ? 0 : 1;
+    Error += C == glm::quat(45.f, glm::vec3(0, 0, 1)) ? 0 : 1;

    return Error;
 }