Set lightGrid point colour to r_forceAmbient after overbright shift

Avoid overflow and incorrect results due to the overbright shift.
DaemonEngine · Jan 26, 2025 · 1d3667a · 1d3667a
1 parent 959edd9
commit 1d3667a
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/engine/renderer/tr_bsp.cpp b/src/engine/renderer/tr_bsp.cpp
@@ -4124,19 +4124,19 @@ void R_LoadLightGrid( lump_t *l )
 		tmpDirected[ 2 ] = in->directed[ 2 ];
 		tmpDirected[ 3 ] = 255;
 
+		if ( tr.legacyOverBrightClamping )
+		{
+			R_ColorShiftLightingBytes( tmpAmbient );
+			R_ColorShiftLightingBytes( tmpDirected );
+		}
+
 		const byte forceAmbientNormalised = floatToUnorm8( r_forceAmbient.Get() );
 		if ( tmpAmbient[0] < forceAmbientNormalised &&
 			tmpAmbient[1] < forceAmbientNormalised &&
 			tmpAmbient[2] < forceAmbientNormalised ) {
 			VectorSet( tmpAmbient, forceAmbientNormalised, forceAmbientNormalised, forceAmbientNormalised );
 		}
 
-		if ( tr.legacyOverBrightClamping )
-		{
-			R_ColorShiftLightingBytes( tmpAmbient );
-			R_ColorShiftLightingBytes( tmpDirected );
-		}
-
 		for ( j = 0; j < 3; j++ )
 		{
 			ambientColor[ j ] = tmpAmbient[ j ] * ( 1.0f / 255.0f );