浏览代码

Fix GCC9 complaints

Bloodknight 5 年之前
父节点
当前提交
af126ad089
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      Engine/source/T3D/assets/TerrainAsset.cpp

+ 3 - 3
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();