Browse Source

Merge pull request #1552 from Areloch/terrainLoadedStateFix

Makes sure the loading code for terrain assets is properly assigned.
Brian Roberts 1 ngày trước cách đây
mục cha
commit
099da1764f
1 tập tin đã thay đổi với 15 bổ sung3 xóa
  1. 15 3
      Engine/source/T3D/assets/TerrainAsset.cpp

+ 15 - 3
Engine/source/T3D/assets/TerrainAsset.cpp

@@ -191,8 +191,14 @@ void TerrainAsset::setTerrainFileName(const char* pScriptFile)
 
 U32 TerrainAsset::load()
 {
+   if (mLoadedState == AssetErrCode::Ok)
+      return mLoadedState;
+
    if (!Torque::FS::IsFile(mTerrainFilePath))
-      return BadFileReference;
+   {
+      mLoadedState = BadFileReference;
+      return mLoadedState;
+   }
 
    mTerrMaterialAssets.clear();
    mTerrMaterialAssetIds.clear();
@@ -229,9 +235,15 @@ U32 TerrainAsset::load()
    mTerrainFile = ResourceManager::get().load(mTerrainFilePath);
 
    if (mTerrainFile)
-      return Ok;
+   {
+      mLoadedState = Ok;
+   }
+   else
+   {
+      mLoadedState = BadFileReference;
+   }
 
-   return BadFileReference;
+   return mLoadedState;
 }
 
 //------------------------------------------------------------------------------