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

diff --git a/gl_models.c b/gl_models.c
index 3408cedf703d840b9aaea43e5fa1ca29af20969c..5dfc5bc7a2dfba84889b7e5f13f6a35a2e044d65 100644 (file)
--- 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;