From ce1be5e881ade9da91aff1d2f3155213985cdacb Mon Sep 17 00:00:00 2001
From: JeffR <Areloch@gmail.com>
Date: Mon, 15 Sep 2025 21:16:34 -0500
Subject: [PATCH 1/2] Makes sure the loading code for terrain assets is
 properly assigned. This ensures stuff like saving works properly.

---
 Engine/source/T3D/assets/TerrainAsset.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/Engine/source/T3D/assets/TerrainAsset.cpp b/Engine/source/T3D/assets/TerrainAsset.cpp
index 11dd64796..144e534b1 100644
--- a/Engine/source/T3D/assets/TerrainAsset.cpp
+++ b/Engine/source/T3D/assets/TerrainAsset.cpp
@@ -192,7 +192,10 @@ void TerrainAsset::setTerrainFileName(const char* pScriptFile)
 U32 TerrainAsset::load()
 {
    if (!Torque::FS::IsFile(mTerrainFilePath))
-      return BadFileReference;
+   {
+      mLoadedState = BadFileReference;
+      return mLoadedState;
+   }
 
    mTerrMaterialAssets.clear();
    mTerrMaterialAssetIds.clear();
@@ -229,9 +232,15 @@ U32 TerrainAsset::load()
    mTerrainFile = ResourceManager::get().load(mTerrainFilePath);
 
    if (mTerrainFile)
-      return Ok;
+   {
+      mLoadedState = Ok;
+   }
+   else
+   {
+      mLoadedState = BadFileReference;
+   }
 
-   return BadFileReference;
+   return mLoadedState;
 }
 
 //------------------------------------------------------------------------------

From 11548d2630e03823bfe9bac97d11fd0e480385ba Mon Sep 17 00:00:00 2001
From: JeffR <Areloch@gmail.com>
Date: Mon, 15 Sep 2025 21:26:56 -0500
Subject: [PATCH 2/2] Added early-out check if we're already successfully
 loaded

---
 Engine/source/T3D/assets/TerrainAsset.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Engine/source/T3D/assets/TerrainAsset.cpp b/Engine/source/T3D/assets/TerrainAsset.cpp
index 144e534b1..ff0cbbe8d 100644
--- a/Engine/source/T3D/assets/TerrainAsset.cpp
+++ b/Engine/source/T3D/assets/TerrainAsset.cpp
@@ -191,6 +191,9 @@ void TerrainAsset::setTerrainFileName(const char* pScriptFile)
 
 U32 TerrainAsset::load()
 {
+   if (mLoadedState == AssetErrCode::Ok)
+      return mLoadedState;
+
    if (!Torque::FS::IsFile(mTerrainFilePath))
    {
       mLoadedState = BadFileReference;