TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 16:25:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #257 from Bloodknight/UbuntuGCC9-fixes

Browse source 
Fix GCC9 complaints
This commit is contained in:
Brian Roberts 2020-07-26 13:09:27 -05:00 • committed by GitHub
commit b2c4ff7745
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
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) if (!success)
{ {
Con::printf("TerrainAsset::getAssetIdByFilename() - failed to auto-import terrainfile(%s) as an TerrainAsset", fileName); Con::printf("TerrainAsset::getAssetIdByFilename() - failed to auto-import terrainfile(%s) as an TerrainAsset", fileName);
return nullptr; return StringTable->EmptyString();
} }
ModuleDefinition* targetModuleDef = AssetImporter::getModuleFromPath(fileName); ModuleDefinition* targetModuleDef = AssetImporter::getModuleFromPath(fileName);
@ -378,7 +378,7 @@ StringTableEntry TerrainAsset::getAssetIdByFilename(StringTableEntry fileName)
if (!targetModuleDef) 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); 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()); success = AssetDatabase.addDeclaredAsset(targetModuleDef, tamlPath.c_str());
@ -386,7 +386,7 @@ StringTableEntry TerrainAsset::getAssetIdByFilename(StringTableEntry fileName)
if (!success) 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()); 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(); String assetId = targetModuleDef->getModuleId();