瀏覽代碼

misc asset pipeline cleanups
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

AzaezelX 5 年之前
父節點
當前提交
f95a78d2e8
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      Engine/source/T3D/assets/assetImporter.cpp

+ 2 - 2
Engine/source/T3D/assets/assetImporter.cpp

@@ -2065,7 +2065,7 @@ void AssetImporter::validateAsset(AssetImportObject* assetItem)
 
          ModuleDefinition* moduleDef = AssetDatabase.getAssetModuleDefinition(assetId);
 
-         if (moduleDef->getModuleId() != StringTable->insert(targetModuleId.c_str()))
+         if ((moduleDef == NULL) || moduleDef->getModuleId() != StringTable->insert(targetModuleId.c_str()))
             continue;
 
          StringTableEntry assetName = AssetDatabase.getAssetName(assetId);
@@ -2982,7 +2982,7 @@ Torque::Path AssetImporter::importShapeAsset(AssetImportObject* assetItem)
       {
          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(".", "_");