Merge pull request #256 from Bloodknight/UbuntuGCC9-fixes

Fix GCC9 complaints

Engine/source/T3D/assets/TerrainAsset.cpp

@@ -370,7 +370,7 @@ StringTableEntry TerrainAsset::getAssetIdByFilename(StringTableEntry fileName)
       if (!success)
       {
          Con::printf("TerrainAsset::getAssetIdByFilename() - failed to auto-import terrainfile(%s) as an TerrainAsset", fileName);
-         return false;
+         return nullptr;
       }
 
       ModuleDefinition* targetModuleDef = AssetImporter::getModuleFromPath(fileName);
@@ -378,7 +378,7 @@ StringTableEntry TerrainAsset::getAssetIdByFilename(StringTableEntry fileName)
       if (!targetModuleDef)
       {
          Con::printf("TerrainAsset::getAssetIdByFilename() - failed to auto-import terrainfile(%s) as an TerrainAsset, unable to find a valid Module for the filePath", fileName);
-         return false;
+         return nullptr;
       }
 
       success = AssetDatabase.addDeclaredAsset(targetModuleDef, tamlPath.c_str());
@@ -386,7 +386,7 @@ StringTableEntry TerrainAsset::getAssetIdByFilename(StringTableEntry fileName)
       if (!success)
       {
          Con::printf("TerrainAsset::getAssetIdByFilename() - failed to auto-import terrainfile(%s) as an TerrainAsset, unable to find a register asset with path", tamlPath.c_str());
-         return false;
+         return nullptr;
       }
 
       String assetId = targetModuleDef->getModuleId();

Engine/source/T3D/assets/assetImporter.cpp

@@ -354,7 +354,7 @@ bool AssetImportObject::_setFilePath(void* obj, const char* index, const char* d
 void AssetImportObject::setFilePath(StringTableEntry pFilePath)
 {
    filePathString = pFilePath;
-   filePath = pFilePath;
+   filePath = Torque::Path(pFilePath);
 }
 
 ConsoleDocClass(AssetImporter,
@@ -2041,7 +2041,7 @@ void AssetImporter::importAssets(AssetImportObject* assetItem)
             if (isMethod(processCommand.c_str()))
             {
                ConsoleValueRef importReturnVal = Con::executef(this, processCommand.c_str(), childItem);
-               assetPath = importReturnVal.getStringValue();
+               assetPath = Torque::Path(importReturnVal.getStringValue());
             }
          }