1
0

Merging r6275 through r6286 from trunk to ogl-es branch

- Fixing warnings
- Updating bzip2 and zlib libraries


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6287 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2022-01-07 16:30:25 +00:00
parent 6d96663c9a
commit 67469c8899
73 changed files with 2438 additions and 1530 deletions

View File

@@ -55,9 +55,6 @@ class quaternion
//! inequality operator
bool operator!=(const quaternion& other) const;
//! Assignment operator
inline quaternion& operator=(const quaternion& other);
#ifndef IRR_TEST_BROKEN_QUATERNION_USE
//! Matrix assignment operator
inline quaternion& operator=(const matrix4& other);
@@ -240,15 +237,6 @@ inline bool quaternion::operator!=(const quaternion& other) const
return !(*this == other);
}
// assignment operator
inline quaternion& quaternion::operator=(const quaternion& other)
{
X = other.X;
Y = other.Y;
Z = other.Z;
W = other.W;
return *this;
}
#ifndef IRR_TEST_BROKEN_QUATERNION_USE
// matrix assignment operator