From 3892bf96e24b04df953e2e31491051e48b84e502 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 15 Apr 2026 14:49:14 +0200
Subject: [PATCH 1/2] Fix navmesh generation over terrain regression from
 8f50d9faec925df6e3c878b2e603550da6165d4b

#4051
---
 Source/Engine/Terrain/TerrainPatch.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/Engine/Terrain/TerrainPatch.cpp b/Source/Engine/Terrain/TerrainPatch.cpp
index 164fce747..f986cf791 100644
--- a/Source/Engine/Terrain/TerrainPatch.cpp
+++ b/Source/Engine/Terrain/TerrainPatch.cpp
@@ -2591,11 +2591,11 @@ void TerrainPatch::ExtractCollisionGeometry(Array<Float3>& vertexBuffer, Array<i
     const int32 indexCount = (rows - 1) * (cols - 1) * 6;
     indexBuffer.Resize(indexCount);
     int32* ib = indexBuffer.Get();
-    for (int32 col = 0; col < cols - 1; col++)
+    for (int32 row = 0; row < rows - 1; row++)
     {
-        for (int32 row = 0; row < rows - 1; row++)
+        for (int32 col = 0; col < cols - 1; col++)
         {
-#define GET_INDEX(x, y) *ib++ = (col + (y)) + (row + (x)) * cols
+#define GET_INDEX(x, y) *ib++ = (col + (y)) * cols + (row + (x))
 
             GET_INDEX(0, 0);
             GET_INDEX(1, 1);

From 51af51d00825a337410e8c153a1d6b647f746357 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 15 Apr 2026 22:34:10 +0200
Subject: [PATCH 2/2] Fix missing `OrthoSize` property serialization on
 `Camera`

#4053
---
 Source/Engine/Level/Actors/Camera.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Source/Engine/Level/Actors/Camera.cpp b/Source/Engine/Level/Actors/Camera.cpp
index 4a7d2aa75..b5b30e52d 100644
--- a/Source/Engine/Level/Actors/Camera.cpp
+++ b/Source/Engine/Level/Actors/Camera.cpp
@@ -454,6 +454,7 @@ void Camera::Serialize(SerializeStream& stream, const void* otherObj)
     SERIALIZE_MEMBER(CustomAspectRatio, _customAspectRatio);
     SERIALIZE_MEMBER(Near, _near);
     SERIALIZE_MEMBER(Far, _far);
+    SERIALIZE_MEMBER(OrthoSize, _orthoSize);
     SERIALIZE_MEMBER(OrthoScale, _orthoScale);
     SERIALIZE(RenderLayersMask);
     SERIALIZE(RenderFlags);
@@ -470,6 +471,7 @@ void Camera::Deserialize(DeserializeStream& stream, ISerializeModifier* modifier
     DESERIALIZE_MEMBER(CustomAspectRatio, _customAspectRatio);
     DESERIALIZE_MEMBER(Near, _near);
     DESERIALIZE_MEMBER(Far, _far);
+    DESERIALIZE_MEMBER(OrthoSize, _orthoSize);
     DESERIALIZE_MEMBER(OrthoScale, _orthoScale);
     DESERIALIZE(RenderLayersMask);
     DESERIALIZE(RenderFlags);