Fix rgbGen linearization

slipher · slipher · commit 055229375d72 · 2026-05-08T22:51:17.000-05:00
Regression in bd91b46
diff --git a/src/engine/renderer/tr_shader.cpp b/src/engine/renderer/tr_shader.cpp
@@ -1486,7 +1486,7 @@ static bool LoadMap( shaderStage_t *stage, const char *buffer, stageType_t type,
 		if ( ! ( shader.registerFlags & RSF_2D ) )
 		{
 			stage->convertColorFromSRGB = stage->colorspaceBits & LINEAR_RGBGEN ?
-				convertColorFromSRGB_NOP : stage->convertColorFromSRGB;
+				convertColorFromSRGB_NOP : tr.convertColorFromSRGB;
 
 			switch ( type )
 			{

Original file line number	Diff line number	Diff line change
`@@ -1486,7 +1486,7 @@ static bool LoadMap( shaderStage_t stage, const char buffer, stageType_t type,`
`1486`	`1486`	`if ( ! ( shader.registerFlags & RSF_2D ) )`
`1487`	`1487`	`{`
`1488`	`1488`	`stage->convertColorFromSRGB = stage->colorspaceBits & LINEAR_RGBGEN ?`
`1489`		`- convertColorFromSRGB_NOP : stage->convertColorFromSRGB;`
	`1489`	`+ convertColorFromSRGB_NOP : tr.convertColorFromSRGB;`
`1490`	`1490`
`1491`	`1491`	`switch ( type )`
`1492`	`1492`	`{`