BRNSystems/irrlicht
1
0
Fork 0
forked from Mirrorlandia_minetest/irrlicht
Code Pull Requests Activity

Sort out two -Wdeprecated-copy warnings

Browse Source 
- SMaterial copy constructor is removed entirely
  (same change in upstream trunk r6362)
- CMatrix4 gets an explicit, but default copy constructor readded
This commit is contained in:
sfan5 2022-04-28 21:16:10 +02:00
parent 8b1d0db8e2
commit c9b66c8c58
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/SMaterial.h
View File

@ -301,16 +301,6 @@ namespace video
FogEnable(false), NormalizeNormals(false), UseMipMaps(true) FogEnable(false), NormalizeNormals(false), UseMipMaps(true)
{ } { }
//! Copy constructor
/** \param other Material to copy from. */
SMaterial(const SMaterial& other)
{
// These pointers are checked during assignment
for (u32 i=0; i<MATERIAL_MAX_TEXTURES; ++i)
TextureLayer[i].TextureMatrix = 0;
*this = other;
}
//! Texture layer array. //! Texture layer array.
SMaterialLayer TextureLayer[MATERIAL_MAX_TEXTURES]; SMaterialLayer TextureLayer[MATERIAL_MAX_TEXTURES];

3
include/matrix4.h
View File

@ -102,6 +102,9 @@ namespace core
//! Simple operator for linearly accessing every element of the matrix. //! Simple operator for linearly accessing every element of the matrix.
const T& operator[](u32 index) const { return M[index]; } const T& operator[](u32 index) const { return M[index]; }
//! Sets this matrix equal to the other matrix.
CMatrix4<T>& operator=(const CMatrix4<T> &other) = default;
//! Sets all elements of this matrix to the value. //! Sets all elements of this matrix to the value.
inline CMatrix4<T>& operator=(const T& scalar); inline CMatrix4<T>& operator=(const T& scalar);