TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1560 from marauder2k9-torque/assimp-armature-fixes

Browse source 
DSQ Fixes
This commit is contained in:
Brian Roberts 2025-09-23 13:22:34 -05:00 committed by GitHub
parent 70a4e5966f 10acab1b07
commit f1723bbb28
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/assets/assetImporter.cpp
View file

@ -2097,7 +2097,7 @@ void AssetImporter::processShapeAnimationAsset(AssetImportObject* assetItem)
{
enumColladaForImport(filePath, shapeInfo, false);
}
else if (fileExt.compare("dts") == 0 || fileExt.compare("dsq") == 0)
else if (fileExt.compare("dts") == 0)
{
enumDTSForImport(filePath, shapeInfo);
}

6
Engine/source/ts/tsShapeConstruct.cpp
View file

@ -2155,15 +2155,13 @@ DefineTSShapeConstructorMethod(addSequence, bool,
StringTableEntry assetType = AssetDatabase.getAssetType(assetId);
if (assetType == StringTable->insert("ShapeAsset"))
{
ShapeAsset* asset = AssetDatabase.acquireAsset<ShapeAsset>(assetId);
AssetPtr<ShapeAsset> asset = assetId;
srcPath = asset->getShapeFile();
AssetDatabase.releaseAsset(assetId);
}
else if (assetType == StringTable->insert("ShapeAnimationAsset"))
{
ShapeAnimationAsset* asset = AssetDatabase.acquireAsset<ShapeAnimationAsset>(assetId);
AssetPtr<ShapeAnimationAsset> asset = assetId;
srcPath = asset->getAnimationPath();
AssetDatabase.releaseAsset(assetId);
}
}