diff options
| author | Nay <dnpd.dd@gmail.com> | 2013-09-01 09:41:45 -0700 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2013-09-01 09:41:45 -0700 |
| commit | 6f9099c0fb21b562173433b4af44198051c40941 (patch) | |
| tree | 43c18d21cf29961b4ef7b2c17907f12e25b14b2d | |
| parent | 6b60877e3e54e996fdfec01920050acf033d4c6f (diff) | |
| parent | a0f4177f5d260d64710f201cca442c0348d3f7b0 (diff) | |
Merge pull request #10693 from Chaplain/g3d-typos
Dep/G3D: Fix a typo in Vector3int32 += operator
| -rw-r--r-- | dep/g3dlite/G3D-v8.0_hotfix8.diff | bin | 0 -> 886 bytes | |||
| -rw-r--r-- | dep/g3dlite/Readme.txt | 1 | ||||
| -rw-r--r-- | dep/g3dlite/include/G3D/Vector3int32.h | 2 |
3 files changed, 2 insertions, 1 deletions
diff --git a/dep/g3dlite/G3D-v8.0_hotfix8.diff b/dep/g3dlite/G3D-v8.0_hotfix8.diff Binary files differnew file mode 100644 index 00000000000..0bca2c58407 --- /dev/null +++ b/dep/g3dlite/G3D-v8.0_hotfix8.diff diff --git a/dep/g3dlite/Readme.txt b/dep/g3dlite/Readme.txt index db89431f0e0..7988d1f314e 100644 --- a/dep/g3dlite/Readme.txt +++ b/dep/g3dlite/Readme.txt @@ -8,3 +8,4 @@ G3D-v8.0_hotfix4.diff - 2012-11-09 - fix compilation on OSX G3D-v8.0_hotfix5.diff - 2013-02-27 - fix compilation in cygwin environments G3D-v8.0_hotfix6.diff - 2013-03-08 - fix compilation in mingw G3D-v8.0_hotfix7.diff - 2013-08-31 - fix typo in Matrix4 == operator +G3D-v8.0_hotfix8.diff - 2013-09-01 - fix typo in Vector3int32 += operator diff --git a/dep/g3dlite/include/G3D/Vector3int32.h b/dep/g3dlite/include/G3D/Vector3int32.h index 2f256ea0300..c1a6b21e100 100644 --- a/dep/g3dlite/include/G3D/Vector3int32.h +++ b/dep/g3dlite/include/G3D/Vector3int32.h @@ -74,7 +74,7 @@ public: inline Vector3int32& operator+=(const Vector3int32& other) { x += other.x; y += other.y; - z += other.y; + z += other.z; return *this; } |