diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2000-10-20 19:54:49 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2000-10-20 19:54:49 +0000 |
| commit | d475730357ff1595470fbe9856b2c88ad0a771ca (patch) | |
| tree | 4e08bd0daca110c84d6deaeff942a5adc1076890 /src/mesa/main/lines.c | |
| parent | a2d2aed64aebcce9cb3aa777628bc14a08f595aa (diff) | |
| download | external_mesa3d-d475730357ff1595470fbe9856b2c88ad0a771ca.zip external_mesa3d-d475730357ff1595470fbe9856b2c88ad0a771ca.tar.gz external_mesa3d-d475730357ff1595470fbe9856b2c88ad0a771ca.tar.bz2 | |
Changes for multitexture > 3, code clean-ups.
Added GLboolean ctx->Texture.MultiTextureEnabled to determine when
multitexture is enabled. Eventually ctx->Texture.ReallyEnabled may
become a boolean.
Diffstat (limited to 'src/mesa/main/lines.c')
| -rw-r--r-- | src/mesa/main/lines.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/lines.c b/src/mesa/main/lines.c index 7330ea5..41d3262 100644 --- a/src/mesa/main/lines.c +++ b/src/mesa/main/lines.c @@ -1,4 +1,4 @@ -/* $Id: lines.c,v 1.15 2000/09/30 18:42:29 brianp Exp $ */ +/* $Id: lines.c,v 1.16 2000/10/20 19:54:49 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -1086,7 +1086,7 @@ void gl_set_line_function( GLcontext *ctx ) /* antialiased lines */ if (rgbmode) { if (ctx->Texture.ReallyEnabled) { - if (ctx->Texture.ReallyEnabled >= TEXTURE1_1D + if (ctx->Texture.MultiTextureEnabled || ctx->Light.Model.ColorControl==GL_SEPARATE_SPECULAR_COLOR) /* Multitextured! */ ctx->Driver.LineFunc = aa_multitex_rgba_line; @@ -1101,7 +1101,7 @@ void gl_set_line_function( GLcontext *ctx ) } } else if (ctx->Texture.ReallyEnabled) { - if (ctx->Texture.ReallyEnabled >= TEXTURE1_1D + if (ctx->Texture.MultiTextureEnabled || ctx->Light.Model.ColorControl==GL_SEPARATE_SPECULAR_COLOR) { /* multi-texture and/or separate specular color */ if (ctx->Light.ShadeModel==GL_SMOOTH) |