From 88423dcbc6114d685a80d8bdd267fd031c0f0545 Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Sun, 25 May 2014 18:07:45 -0500 Subject: Have OpenGL2 "map $lightmap" check for NULL tr.lightmaps too Zero length lightmap lump will have NULL tr.lightmaps. OpenGL1 already has this check, because r_vertexLight 1 would crash Team Arena. OpenGL2 does not disable loading lightmaps when r_vertexLight is 1 though, so it does not have that issue. --- src/renderergl2/tr_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/renderergl2/tr_shader.c b/src/renderergl2/tr_shader.c index 567d465b..afc8d80d 100644 --- a/src/renderergl2/tr_shader.c +++ b/src/renderergl2/tr_shader.c @@ -640,7 +640,7 @@ static qboolean ParseStage( shaderStage_t *stage, char **text ) else if ( !Q_stricmp( token, "$lightmap" ) ) { stage->bundle[0].isLightmap = qtrue; - if ( shader.lightmapIndex < 0 ) { + if ( shader.lightmapIndex < 0 || !tr.lightmaps ) { stage->bundle[0].image[0] = tr.whiteImage; } else { stage->bundle[0].image[0] = tr.lightmaps[shader.lightmapIndex]; -- cgit