From 7cbf7115680eaa89933e6bd9fed5bfcddf860fc0 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Wed, 13 Mar 2024 02:11:09 -0700
Subject: [PATCH] Splats: fix fullbright / RF_NOCOLORMAPS still using sector
 colormap (underwater)

Fullbright is supposed to ignore colormaps but splats were
misbehaving.
---
 src/r_splats.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/r_splats.c b/src/r_splats.c
index 0c2511b6e..36c6961f9 100644
--- a/src/r_splats.c
+++ b/src/r_splats.c
@@ -422,7 +422,7 @@ static void R_RasterizeFloorSplat(floorsplat_t *pSplat, vector2_t *verts, visspr
 	if (ds.translation == NULL)
 		ds.translation = colormaps;
 
-	if (vis->extra_colormap)
+	if (vis->extra_colormap && !(vis->cut & SC_FULLBRIGHT) && !(vis->renderflags & RF_NOCOLORMAPS))
 	{
 		if (!ds.colormap)
 			ds.colormap = vis->extra_colormap->colormap;