Dep/G3D: Backport fix from G3D10

(cherry picked from commit b9d5b194df2719bda956ea4f8794916ceb4bdd58)

3 files changed, 18 insertions, 1 deletions

diff --git a/dep/g3dlite/G3D-v9.0 hotfix4.diff b/dep/g3dlite/G3D-v9.0 hotfix4.diff
new file mode 100644
index 00000000000..71589d226ae
--- /dev/null
+++ b/dep/g3dlite/G3D-v9.0 hotfix4.diff
@@ -0,0 +1,16 @@
+ dep/g3dlite/source/Matrix4.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dep/g3dlite/source/Matrix4.cpp b/dep/g3dlite/source/Matrix4.cpp
+index f3b25ad..0588cb6 100644
+--- a/dep/g3dlite/source/Matrix4.cpp
++++ b/dep/g3dlite/source/Matrix4.cpp
+@@ -606,7 +606,7 @@ bool Matrix4float64::operator==(const Matrix4float64& other) const {
+     // If the bit patterns are identical, they must be
+     // the same matrix.  If not, they *might* still have
+     // equal elements due to floating point weirdness.
+-    if (memcmp(this, &other, sizeof(Matrix4float64) == 0)) {
++    if (memcmp(this, &other, sizeof(Matrix4float64)) == 0) {
+         return true;
+     } 
+ 
diff --git a/dep/g3dlite/Readme.txt b/dep/g3dlite/Readme.txt
index 74399439220..682a2404d96 100644
--- a/dep/g3dlite/Readme.txt
+++ b/dep/g3dlite/Readme.txt
@@ -13,3 +13,4 @@ G3D-v8.0_hotfix9.diff - 2014-06-01 - only VS < 10 don't ship inttypes.h
 G3D-v9.0 hotfix1.diff - 2014-08-22 - updated to G3D9, reapplied previous patches and removed unneeded changes
 G3D-v9.0 hotfix2.diff - 2014-08-23 - fix some -Wconversion warnings
 G3D-v9.0 hotfix3.diff - 2015-06-28 - fix some warnings
+G3D-v9.0 hotfix4.diff - 2015-07-02 - backport G3D10 fix
diff --git a/dep/g3dlite/source/Matrix4.cpp b/dep/g3dlite/source/Matrix4.cpp
index f3b25ad5837..0588cb6ff46 100644
--- a/dep/g3dlite/source/Matrix4.cpp
+++ b/dep/g3dlite/source/Matrix4.cpp
@@ -606,7 +606,7 @@ bool Matrix4float64::operator==(const Matrix4float64& other) const {
     // If the bit patterns are identical, they must be
     // the same matrix.  If not, they *might* still have
     // equal elements due to floating point weirdness.
-    if (memcmp(this, &other, sizeof(Matrix4float64) == 0)) {
+    if (memcmp(this, &other, sizeof(Matrix4float64)) == 0) {
         return true;
     }