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

Merge pull request #889 from Azaezel/alpha401/maptoRegressionFix

Browse source 
correct a flaw with mapto importing.
This commit is contained in:
Brian Roberts 2022-09-13 19:48:42 -05:00 • committed by GitHub
commit e60ba66e23
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -606,6 +606,7 @@ void AssetImporter::addImportingAssetItem(AssetImportObject* assetItem, AssetImp
AssetImportObject* AssetImporter::addImportingAsset(String assetType, Torque::Path filePath, AssetImportObject* parentItem, String assetNameOverride) AssetImportObject* AssetImporter::addImportingAsset(String assetType, Torque::Path filePath, AssetImportObject* parentItem, String assetNameOverride)
{ {
String assetName; 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 //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()) if (assetNameOverride.isNotEmpty())
@ -638,6 +639,8 @@ AssetImportObject* AssetImporter::addImportingAsset(String assetType, Torque::Pa
pos = dStrcspn(sanitizedStr, "-+*/%$&<26>=()[].?\\\"#,;!~<>|<7C>^{}"); pos = dStrcspn(sanitizedStr, "-+*/%$&<26>=()[].?\\\"#,;!~<>|<7C>^{}");
} }
origionalName = assetName;
//If we did, indeed, modify the name, update it now //If we did, indeed, modify the name, update it now
if (String(sanitizedStr) != assetName) if (String(sanitizedStr) != assetName)
{ {
@ -648,7 +651,7 @@ AssetImportObject* AssetImporter::addImportingAsset(String assetType, Torque::Pa
assetImportObj->filePath = filePath; assetImportObj->filePath = filePath;
assetImportObj->filePathString = StringTable->insert(filePath.getFullPath().c_str()); assetImportObj->filePathString = StringTable->insert(filePath.getFullPath().c_str());
assetImportObj->assetName = assetName; assetImportObj->assetName = assetName;
assetImportObj->cleanAssetName = assetName; assetImportObj->cleanAssetName = origionalName;
assetImportObj->moduleName = targetModuleId; assetImportObj->moduleName = targetModuleId;
assetImportObj->status = ""; assetImportObj->status = "";
assetImportObj->statusType = ""; assetImportObj->statusType = "";