From 00c348093807a71c4865a127ca9f3b592c979bd1 Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Sun, 18 Feb 2018 13:05:27 -0600 Subject: [PATCH] OpenGL2: Fix crash when BSP has deluxe maps and vertex lit surfaces MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported by Mickaël Thomas (mickael9). --- code/renderergl2/tr_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/renderergl2/tr_shader.c b/code/renderergl2/tr_shader.c index b1c88f9b..fe2cf0c3 100644 --- a/code/renderergl2/tr_shader.c +++ b/code/renderergl2/tr_shader.c @@ -2232,7 +2232,7 @@ static void CollapseStagesToLightall(shaderStage_t *diffuse, defs |= LIGHTDEF_USE_LIGHT_VERTEX; } - if (r_deluxeMapping->integer && tr.worldDeluxeMapping && lightmap) + if (r_deluxeMapping->integer && tr.worldDeluxeMapping && lightmap && shader.lightmapIndex >= 0) { //ri.Printf(PRINT_ALL, ", deluxemap"); diffuse->bundle[TB_DELUXEMAP] = lightmap->bundle[0];