فهرست منبع

Merge pull request #257 from Bloodknight/UbuntuGCC9-fixes

Fix GCC9 complaints
Brian Roberts 5 سال پیش
والد
کامیت
b2c4ff7745
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)
       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();