aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dep/g3dlite/G3D-v9.0 hotfix5.diff13
-rw-r--r--dep/g3dlite/include/G3D/Quat.h6
2 files changed, 16 insertions, 3 deletions
diff --git a/dep/g3dlite/G3D-v9.0 hotfix5.diff b/dep/g3dlite/G3D-v9.0 hotfix5.diff
index 02f67a9b279..7bc4073ef62 100644
--- a/dep/g3dlite/G3D-v9.0 hotfix5.diff
+++ b/dep/g3dlite/G3D-v9.0 hotfix5.diff
@@ -13,3 +13,16 @@ index 04e11e0..b26708a 100644
}
/** Make unit length in place */
+@@ -349,9 +349,9 @@ public:
+ the magnitude.
+ */
+ Quat toUnit() const {
+- Quat x = *this;
+- x.unitize();
+- return x;
++ Quat copyOfThis = *this;
++ copyOfThis.unitize();
++ return copyOfThis;
+ }
+
+ /**
diff --git a/dep/g3dlite/include/G3D/Quat.h b/dep/g3dlite/include/G3D/Quat.h
index b26708a6d48..73e661a4f48 100644
--- a/dep/g3dlite/include/G3D/Quat.h
+++ b/dep/g3dlite/include/G3D/Quat.h
@@ -349,9 +349,9 @@ public:
the magnitude.
*/
Quat toUnit() const {
- Quat x = *this;
- x.unitize();
- return x;
+ Quat copyOfThis = *this;
+ copyOfThis.unitize();
+ return copyOfThis;
}
/**