From: divverent Date: Mon, 29 Aug 2011 19:23:31 +0000 (+0000) Subject: add missing TEXF_ALPHA when loading the glossmap X-Git-Tag: xonotic-v0.5.0~20 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=eb650690a0e53f4b150fd00f2e6a52d092bcdff8 add missing TEXF_ALPHA when loading the glossmap git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11308 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=746a56a1fccc8b4577c9fddd0b4fcd5e33df5d89 --- diff --git a/gl_rmain.c b/gl_rmain.c index 045fc34b..43559bca 100644 --- a/gl_rmain.c +++ b/gl_rmain.c @@ -3418,7 +3418,7 @@ skinframe_t *R_SkinFrame_LoadExternal(const char *name, int textureflags, qboole mymiplevel = savemiplevel; if (skinframe->gloss == NULL && r_loadgloss && (pixels = loadimagepixelsbgra(va("%s_gloss", skinframe->basename), false, false, false, &mymiplevel))) { - skinframe->gloss = R_LoadTexture2D (r_main_texturepool, va("%s_gloss", skinframe->basename), image_width, image_height, pixels, vid.sRGB3D ? TEXTYPE_SRGB_BGRA : TEXTYPE_BGRA, textureflags & (gl_texturecompression_gloss.integer && gl_texturecompression.integer ? ~0 : ~TEXF_COMPRESS), mymiplevel, NULL); + skinframe->gloss = R_LoadTexture2D (r_main_texturepool, va("%s_gloss", skinframe->basename), image_width, image_height, pixels, vid.sRGB3D ? TEXTYPE_SRGB_BGRA : TEXTYPE_BGRA, (TEXF_ALPHA | textureflags) & (gl_texturecompression_gloss.integer && gl_texturecompression.integer ? ~0 : ~TEXF_COMPRESS), mymiplevel, NULL); #ifndef USE_GLES2 if (r_savedds && qglGetCompressedTexImageARB && skinframe->gloss) R_SaveTextureDDSFile(skinframe->gloss, va("dds/%s_gloss.dds", skinframe->basename), r_texture_dds_save.integer < 2, true);