From 76f9a5393f80aa5fa7525e14cfc92198ecd224ad Mon Sep 17 00:00:00 2001 From: havoc Date: Sun, 17 Apr 2005 08:32:21 +0000 Subject: [PATCH] don't draw glow twice when gl_combine is on git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5187 d7cf8633-e32d-0410-b094-e92efae38249 --- gl_models.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gl_models.c b/gl_models.c index 3408cedf..5dfc5bc7 100644 --- a/gl_models.c +++ b/gl_models.c @@ -222,13 +222,13 @@ static void R_DrawAliasModelCallback (const void *calldata1, int calldata2) colorscale = 1; m.texrgbscale[0] = 0; + m.pointer_color = NULL; - if (texture->skin.glow) + if (doglow) { GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); GL_DepthMask(false); m.tex[0] = R_GetTexture(texture->skin.glow); - m.pointer_color = NULL; GL_Color(1, 1, 1, ent->alpha); R_Mesh_State(&m); c_alias_polys += mesh->num_triangles; @@ -242,7 +242,6 @@ static void R_DrawAliasModelCallback (const void *calldata1, int calldata2) GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); GL_DepthMask(false); m.tex[0] = R_GetTexture(texture->skin.fog); - m.pointer_color = NULL; GL_Color(fogcolor[0], fogcolor[1], fogcolor[2], fog * ent->alpha); R_Mesh_State(&m); c_alias_polys += mesh->num_triangles; -- 2.39.2