From 84170351dbac4b21238e7b84bcfdd3a27df42016 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Fri, 3 Aug 2001 00:16:36 +0000
Subject: Fix VERT_RGBA special case.

---
 src/mesa/tnl/t_imm_fixup.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/mesa/tnl')

diff --git a/src/mesa/tnl/t_imm_fixup.c b/src/mesa/tnl/t_imm_fixup.c
index 4cc4704b6b..b0e83c370b 100644
--- a/src/mesa/tnl/t_imm_fixup.c
+++ b/src/mesa/tnl/t_imm_fixup.c
@@ -1,4 +1,4 @@
-/* $Id: t_imm_fixup.c,v 1.25 2001/08/02 22:39:51 keithw Exp $ */
+/* $Id: t_imm_fixup.c,v 1.26 2001/08/03 00:16:36 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -592,10 +592,13 @@ void _tnl_fixup_compiled_cassette( GLcontext *ctx, struct immediate *IM )
 	 fixup_first_1ui(IM->Index, IM->Flag, VERT_INDEX, start,
 			 ctx->Current.Index );
 
-      if (fixup & VERT_RGBA)
+      if (fixup & VERT_RGBA) {
 	 if (IM->CopyOrFlag & VERT_RGBA)
 	    fixup_first_4f(IM->Color, IM->Flag, VERT_RGBA, start,
 			   ctx->Current.Color );
+	 else
+	    fixup &= ~VERT_RGBA;
+      }
 
       if (fixup & VERT_SPEC_RGB)
 	 fixup_first_4f(IM->SecondaryColor, IM->Flag, VERT_SPEC_RGB, start,
-- 
cgit v1.2.3