From 8aa019d2efcf0295beae51989fe4b419ca50ca17 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Sat, 9 Dec 2000 22:09:50 +0000
Subject: [PATCH] _MultiTextureEnabled was being computed incorrectly

---
 src/mesa/swrast/s_context.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index 6192adb2638..00177849477 100644
--- a/src/mesa/swrast/s_context.c
+++ b/src/mesa/swrast/s_context.c
@@ -1,4 +1,4 @@
-/* $Id: s_context.c,v 1.6 2000/11/22 07:32:18 joukj Exp $ */
+/* $Id: s_context.c,v 1.7 2000/12/09 22:09:50 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -326,8 +326,8 @@ _swrast_validate_derived( GLcontext *ctx )
  	 _swrast_update_rasterflags( ctx );
 
       if (swrast->NewState & _NEW_TEXTURE)
-	 swrast->_MultiTextureEnabled = (ctx->Texture._ReallyEnabled &
-					 ~ENABLE_TEX0);
+	 swrast->_MultiTextureEnabled =
+            (ctx->Texture._ReallyEnabled > ENABLE_TEX0);
 
       if (swrast->NewState & _NEW_POLYGON)
 	 _swrast_update_polygon( ctx );
-- 
2.30.2