From b43d03a98bd9e62830a3781f89b05186891a9ec0 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Wed, 11 Jan 2012 21:08:04 +0900 Subject: [PATCH] Let the render specific texture loader decide on sky texture loading. This is necessary to allow the glsl texture loader to process the sky textures. --- libs/models/brush/gl_model_brush.c | 2 ++ libs/models/brush/model_brush.c | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/models/brush/gl_model_brush.c b/libs/models/brush/gl_model_brush.c index 688120316..88c0a8cd0 100644 --- a/libs/models/brush/gl_model_brush.c +++ b/libs/models/brush/gl_model_brush.c @@ -60,6 +60,8 @@ Mod_ProcessTexture (texture_t *tx) { char name[32]; + if (!strncmp (tx->name, "sky", 3)) + return; snprintf (name, sizeof (name), "fb_%s", tx->name); tx->gl_fb_texturenum = Mod_Fullbright ((byte *) (tx + 1), tx->width, tx->height, name); diff --git a/libs/models/brush/model_brush.c b/libs/models/brush/model_brush.c index 0908bd1cc..c90773cfd 100644 --- a/libs/models/brush/model_brush.c +++ b/libs/models/brush/model_brush.c @@ -204,9 +204,7 @@ Mod_LoadTextures (bsp_t *bsp) if (!strncmp (mt->name, "sky", 3)) loadmodel->skytexture = tx; - else { - Mod_ProcessTexture (tx); - } + Mod_ProcessTexture (tx); } // sequence the animations