From 811e796b1a06dc0699e19d2356df6dc0481b65ad Mon Sep 17 00:00:00 2001
From: Jan <jan@laupetin.net>
Date: Tue, 1 Jul 2025 22:06:30 +0100
Subject: [PATCH] chore: add layeredSurfaceTypes to t5 materials

---
 src/ObjCommon/Material/JsonMaterial.h.template          | 2 ++
 src/ObjLoading/Material/JsonMaterialLoader.cpp.template | 4 +++-
 src/ObjWriting/Material/JsonMaterialWriter.cpp.template | 4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/ObjCommon/Material/JsonMaterial.h.template b/src/ObjCommon/Material/JsonMaterial.h.template
index 6afb6b0a..1ff77dcb 100644
--- a/src/ObjCommon/Material/JsonMaterial.h.template
+++ b/src/ObjCommon/Material/JsonMaterial.h.template
@@ -507,6 +507,7 @@ namespace GAME
     public:
 #ifdef FEATURE_T5
         uint8_t maxStreamedMips;
+        unsigned layeredSurfaceTypes;
 #elif defined(FEATURE_T6)
         unsigned layeredSurfaceTypes;
         unsigned surfaceFlags;
@@ -531,6 +532,7 @@ namespace GAME
         JsonMaterial,
 #ifdef FEATURE_T5
         maxStreamedMips,
+        layeredSurfaceTypes,
 #elif defined(FEATURE_T6)
         layeredSurfaceTypes,
         surfaceFlags,
diff --git a/src/ObjLoading/Material/JsonMaterialLoader.cpp.template b/src/ObjLoading/Material/JsonMaterialLoader.cpp.template
index 69ceb3ef..086c7904 100644
--- a/src/ObjLoading/Material/JsonMaterialLoader.cpp.template
+++ b/src/ObjLoading/Material/JsonMaterialLoader.cpp.template
@@ -418,8 +418,10 @@ namespace
             }
 
             material.info.surfaceTypeBits = jMaterial.surfaceTypeBits;
-#ifdef FEATURE_T6
+#if defined(FEATURE_T5) || defined(FEATURE_T6)
             material.info.layeredSurfaceTypes = jMaterial.layeredSurfaceTypes;
+#endif
+#if defined(FEATURE_T6)
             material.info.surfaceFlags = jMaterial.surfaceFlags;
             material.info.contents = jMaterial.contents;
 #endif
diff --git a/src/ObjWriting/Material/JsonMaterialWriter.cpp.template b/src/ObjWriting/Material/JsonMaterialWriter.cpp.template
index fdbec537..6a0a2639 100644
--- a/src/ObjWriting/Material/JsonMaterialWriter.cpp.template
+++ b/src/ObjWriting/Material/JsonMaterialWriter.cpp.template
@@ -313,8 +313,10 @@ namespace
             jMaterial.textureAtlas->columns = material.info.textureAtlasColumnCount;
 
             jMaterial.surfaceTypeBits = material.info.surfaceTypeBits;
-#ifdef FEATURE_T6
+#if defined(FEATURE_T5) || defined(FEATURE_T6)
             jMaterial.layeredSurfaceTypes = material.info.layeredSurfaceTypes;
+#endif
+#if defined(FEATURE_T6)
             jMaterial.surfaceFlags = material.info.surfaceFlags;
             jMaterial.contents = material.info.contents;
 #endif