GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 1.7

Browse Source
This commit is contained in:
Wojtek Figat
2023-09-22 22:43:29 +02:00
parent 20a4e348ef 248304a78f
commit 1c20398d8c
28 changed files with 294 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Engine/Tools/ModelTool/ModelTool.Assimp.cpp
View File

@@ -567,12 +567,17 @@ bool ImportMaterials(ImportedModelData& result, AssimpImporterData& data, String
return false;
}
bool IsMeshInvalid(const aiMesh* aMesh)
{
return aMesh->mPrimitiveTypes != aiPrimitiveType_TRIANGLE || aMesh->mNumVertices == 0 || aMesh->mNumFaces == 0 || aMesh->mFaces[0].mNumIndices != 3;
}
bool ImportMesh(int32 i, ImportedModelData& result, AssimpImporterData& data, String& errorMsg)
{
const auto aMesh = data.Scene->mMeshes[i];
// Skip invalid meshes
if (aMesh->mPrimitiveTypes != aiPrimitiveType_TRIANGLE || aMesh->mNumVertices == 0 || aMesh->mNumFaces == 0 || aMesh->mFaces[0].mNumIndices != 3)
if (IsMeshInvalid(aMesh))
return false;
// Skip unused meshes