From af126ad0899cb001415d9530a64729662e2ca46c Mon Sep 17 00:00:00 2001 From: Bloodknight Date: Wed, 22 Jul 2020 16:40:01 +0100 Subject: [PATCH] Fix GCC9 complaints --- Engine/source/T3D/assets/TerrainAsset.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Engine/source/T3D/assets/TerrainAsset.cpp b/Engine/source/T3D/assets/TerrainAsset.cpp index 4169016f7..76ecc9109 100644 --- a/Engine/source/T3D/assets/TerrainAsset.cpp +++ b/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 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();