From da5570e89fef407cbb84205c950e42438f65f3e5 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Sun, 22 Sep 2024 11:28:26 +0200
Subject: [PATCH] Fix terrain shader compilation regression

---
 Content/Editor/MaterialTemplates/Terrain.shader | 3 +--
 Content/Engine/DefaultTerrainMaterial.flax      | 4 ++--
 Source/Shaders/MaterialCommon.hlsl              | 2 ++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Content/Editor/MaterialTemplates/Terrain.shader b/Content/Editor/MaterialTemplates/Terrain.shader
index 3c4567321..d2996d7a3 100644
--- a/Content/Editor/MaterialTemplates/Terrain.shader
+++ b/Content/Editor/MaterialTemplates/Terrain.shader
@@ -3,6 +3,7 @@
 
 #define MATERIAL 1
 #define USE_PER_VIEW_CONSTANTS 1
+#define LoadObjectFromCB(var) var = GetObject()
 @3
 // Enables/disables smooth terrain chunks LOD transitions (with morphing higher LOD near edges to the lower LOD in the neighbour)
 #define USE_SMOOTH_LOD_TRANSITION 1
@@ -162,8 +163,6 @@ ObjectData GetObject()
     return object;
 }
 
-#define LoadObjectFromCB(var) var = GetObject()
-
 MaterialInput GetMaterialInput(PixelInput input)
 {
 	MaterialInput output = GetGeometryMaterialInput(input.Geometry);
diff --git a/Content/Engine/DefaultTerrainMaterial.flax b/Content/Engine/DefaultTerrainMaterial.flax
index b75d68dcd..9d956c6ab 100644
--- a/Content/Engine/DefaultTerrainMaterial.flax
+++ b/Content/Engine/DefaultTerrainMaterial.flax
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:69b58818698fe9609cee68d29642d75a752db39a1b06508d26994edaa37f0503
-size 23499
+oid sha256:876072ac78d8f346101e45a2b7f52f759bc1e437ccefe1a79ee4fbad68b2c04f
+size 30264
diff --git a/Source/Shaders/MaterialCommon.hlsl b/Source/Shaders/MaterialCommon.hlsl
index f8fcd69f3..325f8d065 100644
--- a/Source/Shaders/MaterialCommon.hlsl
+++ b/Source/Shaders/MaterialCommon.hlsl
@@ -119,6 +119,7 @@ ObjectData LoadObject(Buffer<float4> objectsBuffer, uint objectIndex)
     return object;
 }
 
+#ifndef LoadObjectFromCB
 // Loads the object data from the constant buffer into the variable
 #define LoadObjectFromCB(var) \
     var = (ObjectData)0; \
@@ -129,6 +130,7 @@ ObjectData LoadObject(Buffer<float4> objectsBuffer, uint objectIndex)
     var.WorldDeterminantSign = WorldDeterminantSign; \
     var.LODDitherFactor = LODDitherFactor; \
     var.LightmapArea = LightmapArea;
+#endif
 
 // Material properties
 struct Material