From: havoc Date: Tue, 27 Dec 2005 02:43:33 +0000 (+0000) Subject: fix sprite transparency bug introduced by the palette changes X-Git-Tag: xonotic-v0.1.0preview~4421 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d5a5bb07f2d38ac68f49482b6d76ab9cc21a1155;p=xonotic%2Fdarkplaces.git fix sprite transparency bug introduced by the palette changes git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5866 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/model_shared.c b/model_shared.c index 91d2063b..0565f206 100644 --- a/model_shared.c +++ b/model_shared.c @@ -1004,7 +1004,7 @@ int Mod_LoadSkinFrame_Internal(skinframe_t *skinframe, const char *basename, int Mem_Free(temp1); } // use either a custom palette, or the quake palette - skinframe->base = skinframe->merged = GL_TextureForSkinLayer(skindata, width, height, va("%s_merged", basename), palette ? palette : (loadglowtexture ? palette_nofullbrights : palette_complete), textureflags); // all + skinframe->base = skinframe->merged = GL_TextureForSkinLayer(skindata, width, height, va("%s_merged", basename), palette ? palette : (loadglowtexture ? palette_nofullbrights : ((textureflags & TEXF_ALPHA) ? palette_transparent : palette_complete)), textureflags); // all if (!palette && loadglowtexture) skinframe->glow = GL_TextureForSkinLayer(skindata, width, height, va("%s_glow", basename), palette_onlyfullbrights, textureflags); // glow if (!palette && loadpantsandshirt)