Merge pull request #1559 from Azaezel/alpha41/filterFixFour

even more precice filtering for dts vs dsq
This commit is contained in:
Brian Roberts 2025-09-23 13:22:23 -05:00 committed by GitHub
commit 70a4e5966f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 2 deletions

View file

@ -968,7 +968,14 @@ TSShape* assimpLoadShape(const Torque::Path &path)
TSShapeLoader::updateProgress(TSShapeLoader::Load_Complete, "Import complete");
Con::printf("[ASSIMP] Shape created successfully.");
if (tss->meshes.empty())
bool realMesh = false;
for (U32 i = 0; i < tss->meshes.size(); ++i)
{
if (tss->meshes[i] && tss->meshes[i]->getMeshType() != TSMesh::NullMeshType)
realMesh = true;
}
if (!realMesh)
{
Torque::Path dsqPath(cachedPath);
dsqPath.setExtension("dsq");

View file

@ -725,7 +725,14 @@ TSShape* loadColladaShape(const Torque::Path &path)
{
#ifndef DAE2DTS_TOOL
if (tss->meshes.empty())
bool realMesh = false;
for (U32 i = 0; i < tss->meshes.size(); ++i)
{
if (tss->meshes[i] && tss->meshes[i]->getMeshType() != TSMesh::NullMeshType)
realMesh = true;
}
if (!realMesh)
{
Torque::Path dsqPath(cachedPath);
dsqPath.setExtension("dsq");