TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 14:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Update Assimp from 5.2.3 to 5.2.5

Browse source
This commit is contained in:
Bloodknight 2022-10-02 19:02:49 +01:00
parent ea7ca63301
commit 16f3710058
379 changed files with 14469 additions and 47175 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Engine/lib/assimp/code/AssetLib/LWO/LWOFileData.h
View file

@ -338,13 +338,7 @@ struct Face : public aiFace {
uint32_t type;
//! Assignment operator
Face &operator=(const LWO::Face &f) {
aiFace::operator=(f);
surfaceIndex = f.surfaceIndex;
smoothGroup = f.smoothGroup;
type = f.type;
return *this;
}
Face &operator=(const LWO::Face &f) = default;
};
// ---------------------------------------------------------------------------
@ -354,7 +348,7 @@ struct VMapEntry {
explicit VMapEntry(unsigned int _dims) :
dims(_dims) {}
virtual ~VMapEntry() {}
virtual ~VMapEntry() = default;
//! allocates memory for the vertex map
virtual void Allocate(unsigned int num) {