From 013f6ebf709e47ca9a799f37a4522115759e19b1 Mon Sep 17 00:00:00 2001 From: Jan Laupetin Date: Wed, 8 Jul 2026 07:33:46 +0200 Subject: [PATCH] fix: remove non-existant camera region in IW5 (#889) --- src/Common/Game/IW5/IW5_Assets.h | 1 - src/ObjCommon/Material/JsonMaterial.h.template | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Common/Game/IW5/IW5_Assets.h b/src/Common/Game/IW5/IW5_Assets.h index 2b436c10..4a667b9b 100644 --- a/src/Common/Game/IW5/IW5_Assets.h +++ b/src/Common/Game/IW5/IW5_Assets.h @@ -948,7 +948,6 @@ namespace IW5 CAMERA_REGION_LIT_TRANS = 0x1, CAMERA_REGION_EMISSIVE = 0x2, CAMERA_REGION_DEPTH_HACK = 0x3, - CAMERA_REGION_LIGHT_MAP_OPAQUE = 0x4, CAMERA_REGION_COUNT, CAMERA_REGION_NONE = CAMERA_REGION_COUNT, diff --git a/src/ObjCommon/Material/JsonMaterial.h.template b/src/ObjCommon/Material/JsonMaterial.h.template index b14bf10f..ee47aa99 100644 --- a/src/ObjCommon/Material/JsonMaterial.h.template +++ b/src/ObjCommon/Material/JsonMaterial.h.template @@ -484,9 +484,6 @@ namespace GAME {CAMERA_REGION_LIT_TRANS, "litTrans" }, {CAMERA_REGION_EMISSIVE, "emissive" }, {CAMERA_REGION_DEPTH_HACK, "depthHack" }, -#ifdef FEATURE_IW5 - {CAMERA_REGION_LIGHT_MAP_OPAQUE, "lightMapOpaque"}, -#endif #elif defined(FEATURE_T6) {CAMERA_REGION_LIT_OPAQUE, "litOpaque" }, {CAMERA_REGION_LIT_TRANS, "litTrans" }, @@ -500,6 +497,10 @@ namespace GAME {CAMERA_REGION_SONAR, "sonar" }, #endif {CAMERA_REGION_NONE, "none" }, +#ifdef FEATURE_IW5 + // Backwards compatibility, it was accidentally added but this does not exist on PC + {CAMERA_REGION_NONE, "lightMapOpaque"}, +#endif }); class JsonMaterial