]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
add missing TEXF_ALPHA when loading the glossmap
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Mon, 29 Aug 2011 19:23:31 +0000 (19:23 +0000)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 29 Aug 2011 19:15:53 +0000 (21:15 +0200)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11308 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=746a56a1fccc8b4577c9fddd0b4fcd5e33df5d89

gl_rmain.c

index 045fc34b3774e69c7f12f659a30af9af4a616896..43559bca02c29588cebfd144b1d0ff9c9eb4db27 100644 (file)
@@ -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);