UNMERGE! don't crash in dedicated server when parsing shaders with dpreflectcube

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11151 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=e356fe45dd489969d894461876d1701bb02e79f9

diff --git a/gl_rmain.c b/gl_rmain.c
index a8af5a4d91754fef62c5f32abab68a687dd03b8d..6c0b6505e35f681a4ca019ae2cbd9967f13b9b57 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -3744,7 +3744,7 @@ rtexture_t *R_GetCubemap(const char *basename)
                if (r_texture_cubemaps[i] != NULL)
                        if (!strcasecmp(r_texture_cubemaps[i]->basename, basename))
                                return r_texture_cubemaps[i]->texture ? r_texture_cubemaps[i]->texture : r_texture_whitecube;
-       if (i >= MAX_CUBEMAPS || !r_main_mempool)
+       if (i >= MAX_CUBEMAPS)
                return r_texture_whitecube;
        r_texture_numcubemaps++;
        r_texture_cubemaps[i] = (cubemapinfo_t *)Mem_Alloc(r_main_mempool, sizeof(cubemapinfo_t));