From 6d792f1f74ad1dc1fa84fd58ec758e61aaef9372 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Tue, 12 Mar 2024 17:59:41 +0100
Subject: [PATCH] Fix critical regression in terrain heightmap data upgrade

---
 Source/Engine/Terrain/TerrainPatch.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Source/Engine/Terrain/TerrainPatch.cpp b/Source/Engine/Terrain/TerrainPatch.cpp
index 053ab10e0..9ca25cf14 100644
--- a/Source/Engine/Terrain/TerrainPatch.cpp
+++ b/Source/Engine/Terrain/TerrainPatch.cpp
@@ -2148,7 +2148,9 @@ bool TerrainPatch::CreateHeightField()
     if (collisionHeader->CheckOldMagicNumber != MAX_int32 || collisionHeader->Version != TerrainCollisionDataHeader::CurrentVersion)
     {
         // Reset height map
-        return InitializeHeightMap();
+        PROFILE_CPU_NAMED("ResetHeightMap");
+        const float* data = GetHeightmapData();
+        return SetupHeightMap(_cachedHeightMap.Count(), data);
     }
 
     // Create heightfield object from the data