From 2834d7376a53c9bf55e2cc468ba675efe6b21428 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sun, 4 Jun 2017 10:09:18 +0200 Subject: [PATCH] Fixed dual quaternion != operator #629 --- glm/gtx/dual_quaternion.inl | 2 +- readme.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/glm/gtx/dual_quaternion.inl b/glm/gtx/dual_quaternion.inl index df330ffa..86915284 100644 --- a/glm/gtx/dual_quaternion.inl +++ b/glm/gtx/dual_quaternion.inl @@ -217,7 +217,7 @@ namespace glm template GLM_FUNC_QUALIFIER bool operator!=(tdualquat const & q1, tdualquat const & q2) { - return (q1.real != q2.dual) || (q1.real != q2.dual); + return (q1.real != q2.real) || (q1.dual != q2.dual); } // -- Operations -- diff --git a/readme.md b/readme.md index 109ad9fc..3af5a77c 100644 --- a/readme.md +++ b/readme.md @@ -74,6 +74,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) - Removed doxygen references to GTC_half_float which was removed in 0.9.4 - Fixed glm::decompose #448 - Fixed intersectRayTriangle #6 +- Fixed dual quaternion != operator #629 #### Deprecation: - Requires Visual Studio 2013, GCC 4.7, Clang 3.4, Cuda 7, ICC 2013 or a C++11 compiler