Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef

2018-09-10 22:37:34 -04:00 · 2018-09-10 22:37:34 -04:00 · df4ea79ab7
parent 36522665c3 b7a216c78b
commit df4ea79ab7
1 changed files with 2 additions and 0 deletions
--- a/src/r_data.c
+++ b/src/r_data.c
@ -1359,7 +1359,9 @@ void R_ClearColormaps(void)
 //
 void R_AddColormapToList(extracolormap_t *extra_colormap)
 {
+#ifndef COLORMAPREVERSELIST
 	extracolormap_t *exc;
+#endif

 	if (!extra_colormaps)
 	{