summaryrefslogtreecommitdiff
path: root/src/mesa/swrast/s_lines.c
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2001-05-17 09:32:17 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2001-05-17 09:32:17 +0000
commit89dae684aa1d74b06a4f70cb76b33671d0cef9e6 (patch)
tree9b42d5eb082a5f37920af04048cd6b8a7f20749c /src/mesa/swrast/s_lines.c
parent47cf442c1164b6b406117fccfb8b564602741ee3 (diff)
Fix order of decomposition of quad.
Remove 'swrast->_MultiTexEnabled' derived value.
Diffstat (limited to 'src/mesa/swrast/s_lines.c')
-rw-r--r--src/mesa/swrast/s_lines.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/swrast/s_lines.c b/src/mesa/swrast/s_lines.c
index eec354b84a..19b0d9a1a4 100644
--- a/src/mesa/swrast/s_lines.c
+++ b/src/mesa/swrast/s_lines.c
@@ -1,4 +1,4 @@
-/* $Id: s_lines.c,v 1.16 2001/05/03 22:13:32 brianp Exp $ */
+/* $Id: s_lines.c,v 1.17 2001/05/17 09:32:17 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -1018,7 +1018,7 @@ _swrast_choose_line( GLcontext *ctx )
ASSERT(swrast->Triangle);
}
else if (ctx->Texture._ReallyEnabled) {
- if (swrast->_MultiTextureEnabled ||
+ if (ctx->Texture._ReallyEnabled > TEXTURE0_ANY ||
(ctx->_TriangleCaps & DD_SEPARATE_SPECULAR)) {
/* multi-texture and/or separate specular color */
if (ctx->Light.ShadeModel==GL_SMOOTH)