Merge remote-tracking branch 'ioquake/master' into urt

* ioquake/master:
  OpenGL2: Fix crash when BSP has deluxe maps and vertex lit surfaces
  Increase q3_ui .arena filename list buffer size to 4096 bytes

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];