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

misc asset pipeline cleanups

Browse source 
AssetImporter::validateAsset make sure the modelDef looked for is valid
AssetImporter::importShapeAsset had a stray +"_"+embeded in it when it came to stitching togeather filenames and extentions
This commit is contained in:
AzaezelX 2020-12-14 13:32:45 -06:00
parent 5534384c54
commit f95a78d2e8
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2065,7 +2065,7 @@ void AssetImporter::validateAsset(AssetImportObject* assetItem)
ModuleDefinition* moduleDef = AssetDatabase.getAssetModuleDefinition(assetId); ModuleDefinition* moduleDef = AssetDatabase.getAssetModuleDefinition(assetId);
if (moduleDef->getModuleId() != StringTable->insert(targetModuleId.c_str())) if ((moduleDef == NULL) || moduleDef->getModuleId() != StringTable->insert(targetModuleId.c_str()))
continue; continue;
StringTableEntry assetName = AssetDatabase.getAssetName(assetId); StringTableEntry assetName = AssetDatabase.getAssetName(assetId);
@ -2982,7 +2982,7 @@ Torque::Path AssetImporter::importShapeAsset(AssetImportObject* assetItem)
{ {
constructor = new TSShapeConstructor(qualifiedToFile); constructor = new TSShapeConstructor(qualifiedToFile);
String constructorName = assetItem->filePath.getFileName() + "_" + assetItem->filePath.getExtension().substr(0, 3); String constructorName = assetItem->filePath.getFileName() + assetItem->filePath.getExtension().substr(0, 3);
constructorName.replace(" ", "_"); constructorName.replace(" ", "_");
constructorName.replace("-", "_"); constructorName.replace("-", "_");
constructorName.replace(".", "_"); constructorName.replace(".", "_");