From 7b1c083839a0de3c772d72b62e8e162a128c997e Mon Sep 17 00:00:00 2001
From: Areloch <Areloch@gmail.com>
Date: Fri, 26 Jun 2020 23:28:53 -0500
Subject: [PATCH] Adjusts importer logic of assets to fill spaces in the names
 as underscores to avoid issues.

---
 Engine/source/T3D/assets/TerrainAsset.cpp  | 20 ++++++++++++++------
 Engine/source/T3D/assets/assetImporter.cpp |  2 ++
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/Engine/source/T3D/assets/TerrainAsset.cpp b/Engine/source/T3D/assets/TerrainAsset.cpp
index a056a7bf9..6876e6bdd 100644
--- a/Engine/source/T3D/assets/TerrainAsset.cpp
+++ b/Engine/source/T3D/assets/TerrainAsset.cpp
@@ -252,7 +252,11 @@ bool TerrainAsset::getAssetByFilename(StringTableEntry fileName, AssetPtr<Terrai
       Torque::Path terrFilePath = fileName;
 
       TerrainAsset* newTerrainAsset = new TerrainAsset();
-      newTerrainAsset->setAssetName(terrFilePath.getFileName().c_str());
+
+      String assetName = terrFilePath.getFileName();
+      assetName.replace(" ", "_");
+
+      newTerrainAsset->setAssetName(assetName.c_str());
       String terrainPathBind = terrFilePath.getFileName() + terrFilePath.getExtension();
 
       newTerrainAsset->mTerrainFilePath = StringTable->insert(terrainPathBind.c_str());
@@ -267,7 +271,7 @@ bool TerrainAsset::getAssetByFilename(StringTableEntry fileName, AssetPtr<Terrai
       // Turn-off auto-formatting.
       taml.setAutoFormat(false);
 
-      String tamlPath = terrFilePath.getFullPath() + "/" + terrFilePath.getFileName() + ".asset.taml";
+      String tamlPath = terrFilePath.getFullPath() + "/" + assetName + ".asset.taml";
 
       // Read object.
       bool success = taml.write(newTerrainAsset, tamlPath.c_str());
@@ -296,7 +300,7 @@ bool TerrainAsset::getAssetByFilename(StringTableEntry fileName, AssetPtr<Terrai
 
       String assetId = targetModuleDef->getModuleId();
       assetId += ":";
-      assetId += terrFilePath.getFileName().c_str();
+      assetId += assetName.c_str();
 
       StringTableEntry resultingAssetId = StringTable->insert(assetId.c_str());
 
@@ -339,7 +343,11 @@ StringTableEntry TerrainAsset::getAssetIdByFilename(StringTableEntry fileName)
       Torque::Path terrFilePath = fileName;
 
       TerrainAsset* newTerrainAsset = new TerrainAsset();
-      newTerrainAsset->setAssetName(terrFilePath.getFileName().c_str());
+
+      String assetName = terrFilePath.getFileName();
+      assetName.replace(" ", "_");
+
+      newTerrainAsset->setAssetName(assetName.c_str());
       String terrainPathBind = terrFilePath.getFileName() + "." + terrFilePath.getExtension();
 
       newTerrainAsset->mTerrainFilePath = StringTable->insert(terrainPathBind.c_str());
@@ -354,7 +362,7 @@ StringTableEntry TerrainAsset::getAssetIdByFilename(StringTableEntry fileName)
       // Turn-off auto-formatting.
       taml.setAutoFormat(false);
 
-      String tamlPath = terrFilePath.getPath() + "/" + terrFilePath.getFileName() + ".asset.taml";
+      String tamlPath = terrFilePath.getPath() + "/" + assetName + ".asset.taml";
 
       // Read object.
       bool success = taml.write(newTerrainAsset, tamlPath.c_str());
@@ -383,7 +391,7 @@ StringTableEntry TerrainAsset::getAssetIdByFilename(StringTableEntry fileName)
 
       String assetId = targetModuleDef->getModuleId();
       assetId += ":";
-      assetId += terrFilePath.getFileName().c_str();
+      assetId += assetName.c_str();
 
       StringTableEntry resultingAssetId = StringTable->insert(assetId.c_str());
 
diff --git a/Engine/source/T3D/assets/assetImporter.cpp b/Engine/source/T3D/assets/assetImporter.cpp
index 6e10c4c0e..06f630b35 100644
--- a/Engine/source/T3D/assets/assetImporter.cpp
+++ b/Engine/source/T3D/assets/assetImporter.cpp
@@ -390,6 +390,8 @@ AssetImportObject* AssetImporter::addImportingAsset(String assetType, Torque::Pa
    else
       assetName = filePath.getFileName();
 
+   assetName.replace(" ", "_");
+
    AssetImportObject* assetImportObj = new AssetImportObject();
    assetImportObj->registerObject();