From e5db8d998a5168ba9e6d24ae9243d130d2eb2a74 Mon Sep 17 00:00:00 2001
From: dpjudas <dpjudas@users.noreply.github.com>
Date: Sat, 19 Jul 2025 21:14:55 +0200
Subject: [PATCH] Make uLightProbeIndex take precedence over probemap, if
 specified

---
 wadsrc/static/shaders/scene/lightmodel_pbr.glsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wadsrc/static/shaders/scene/lightmodel_pbr.glsl b/wadsrc/static/shaders/scene/lightmodel_pbr.glsl
index ac882eb2b..e308bd7ab 100644
--- a/wadsrc/static/shaders/scene/lightmodel_pbr.glsl
+++ b/wadsrc/static/shaders/scene/lightmodel_pbr.glsl
@@ -176,7 +176,7 @@ vec3 ProcessMaterialLight(Material material, vec3 ambientLight, float sunlightAt
 
 	vec3 irradiance, prefilteredColor;
 
-	if (vLightmapIndex != -1)
+	if (vLightmapIndex != -1 && uLightProbeIndex == 0)
 	{
 		uvec4 probeIndexes = textureGather(uintTextures[nonuniformEXT(vLightmapIndex + 1)], vLightmap.xy);