TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-21 20:35:35 +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

3
Engine/lib/assimp/code/AssetLib/MDL/HalfLife/UniqueNameGenerator.cpp
View file

@ -68,8 +68,7 @@ UniqueNameGenerator::UniqueNameGenerator(const char *template_name, const char *
separator_(separator) {
}
UniqueNameGenerator::~UniqueNameGenerator() {
}
UniqueNameGenerator::~UniqueNameGenerator() = default;
void UniqueNameGenerator::make_unique(std::vector<std::string> &names) {
struct DuplicateInfo {

4
Engine/lib/assimp/code/AssetLib/MDL/MDLLoader.cpp
View file

@ -98,9 +98,7 @@ MDLImporter::MDLImporter() :
// ------------------------------------------------------------------------------------------------
// Destructor, private as well
MDLImporter::~MDLImporter() {
// empty
}
MDLImporter::~MDLImporter() = default;
// ------------------------------------------------------------------------------------------------
// Returns whether the class can handle the format of the given file.

3
Engine/lib/assimp/code/AssetLib/MDL/MDLMaterialLoader.cpp
View file

@ -449,6 +449,9 @@ void MDLImporter::ParseSkinLump_3DGS_MDL7(
unsigned int iWidth,
unsigned int iHeight) {
std::unique_ptr<aiTexture> pcNew;
if (szCurrent == nullptr) {
return;
}
// get the type of the skin
unsigned int iMasked = (unsigned int)(iType & 0xF);