Merge branch 'fix-splat-fullbright' into 'master'

Splats: fix fullbright / RF_NOCOLORMAPS still using sector colormap (underwater)

See merge request KartKrew/Kart!2100
This commit is contained in:
Gunla 2024-03-13 23:49:33 +00:00
commit 6fe3cd301f

View file

@ -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;