TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix GCC9 complaints

Browse source
This commit is contained in:
Bloodknight 2020-07-22 16:40:01 +01:00
parent f52ae7f1b3
commit af126ad089
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/T3D/assets/TerrainAsset.cpp
View file

@ -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 nullptr;
return StringTable->EmptyString();
}
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 nullptr;
return StringTable->EmptyString();
}
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 nullptr;
return StringTable->EmptyString();
}
String assetId = targetModuleDef->getModuleId();