瀏覽代碼

Merge pull request #889 from Azaezel/alpha401/maptoRegressionFix

correct a flaw with mapto importing.
Brian Roberts 3 年之前
父節點
當前提交
e60ba66e23
共有 1 個文件被更改,包括 4 次插入1 次删除
  1. 4 1
      Engine/source/T3D/assets/assetImporter.cpp

+ 4 - 1
Engine/source/T3D/assets/assetImporter.cpp

@@ -606,6 +606,7 @@ void AssetImporter::addImportingAssetItem(AssetImportObject* assetItem, AssetImp
 AssetImportObject* AssetImporter::addImportingAsset(String assetType, Torque::Path filePath, AssetImportObject* parentItem, String assetNameOverride)
 {
    String assetName;
+   String origionalName;
 
    //In some cases(usually generated assets on import, like materials) we'll want to specifically define the asset name instead of peeled from the filePath
    if (assetNameOverride.isNotEmpty())
@@ -638,6 +639,8 @@ AssetImportObject* AssetImporter::addImportingAsset(String assetType, Torque::Pa
       pos = dStrcspn(sanitizedStr, "-+*/%$&�=()[].?\\\"#,;!~<>|�^{}");
    }
 
+   origionalName = assetName;
+
    //If we did, indeed, modify the name, update it now
    if (String(sanitizedStr) != assetName)
    {
@@ -648,7 +651,7 @@ AssetImportObject* AssetImporter::addImportingAsset(String assetType, Torque::Pa
    assetImportObj->filePath = filePath;
    assetImportObj->filePathString = StringTable->insert(filePath.getFullPath().c_str());
    assetImportObj->assetName = assetName;
-   assetImportObj->cleanAssetName = assetName;
+   assetImportObj->cleanAssetName = origionalName;
    assetImportObj->moduleName = targetModuleId;
    assetImportObj->status = "";
    assetImportObj->statusType = "";