spearmint: OpenGL2: Fix r_greyscale to apply to rgbGen colorwave

zturtleman · zturtleman · commit 2795a84f0c9f · 2026-04-07T11:21:01.000-05:00
diff --git a/code/renderergl2/tr_shade.c b/code/renderergl2/tr_shade.c
@@ -759,7 +759,8 @@ static void ComputeShaderColors( shaderStage_t *pStage, vec4_t baseColor, vec4_t
 	}
 
 	if (pStage->rgbGen == CGEN_CONST || pStage->rgbGen == CGEN_FOG
-	  || pStage->rgbGen == CGEN_ENTITY || pStage->rgbGen == CGEN_ONE_MINUS_ENTITY)
+	  || pStage->rgbGen == CGEN_ENTITY || pStage->rgbGen == CGEN_ONE_MINUS_ENTITY
+	  || pStage->rgbGen == CGEN_COLOR_WAVEFORM)
 	{
 		// if in greyscale rendering mode turn all color values into greyscale.
 		if(r_greyscale->integer)

Original file line number	Diff line number	Diff line change
`@@ -759,7 +759,8 @@ static void ComputeShaderColors( shaderStage_t *pStage, vec4_t baseColor, vec4_t`
`759`	`759`	`}`
`760`	`760`
`761`	`761`	`if (pStage->rgbGen == CGEN_CONST \|\| pStage->rgbGen == CGEN_FOG`
`762`		`- \|\| pStage->rgbGen == CGEN_ENTITY \|\| pStage->rgbGen == CGEN_ONE_MINUS_ENTITY)`
	`762`	`+ \|\| pStage->rgbGen == CGEN_ENTITY \|\| pStage->rgbGen == CGEN_ONE_MINUS_ENTITY`
	`763`	`+ \|\| pStage->rgbGen == CGEN_COLOR_WAVEFORM)`
`763`	`764`	`{`
`764`	`765`	`// if in greyscale rendering mode turn all color values into greyscale.`
`765`	`766`	`if(r_greyscale->integer)`