diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-08-01 19:03:26 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-08-01 19:03:26 +0200 |
| commit | cce7f1adf2b76c59d8a07f080f23d4b125ed8f15 (patch) | |
| tree | 5dab32fdd8c3d277a81caa557a48623a6187d13b /dep/g3dlite | |
| parent | 22653c99f874e189bda6670c42be38151b58e52b (diff) | |
Dep: Silenced build warning in G3D header, part2, forgot to save
Diffstat (limited to 'dep/g3dlite')
| -rw-r--r-- | dep/g3dlite/G3D-v9.0 hotfix5.diff | 13 | ||||
| -rw-r--r-- | dep/g3dlite/include/G3D/Quat.h | 6 |
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; } /** |