From: Keith Whitwell <keith@tungstengraphics.com>
Date: Fri, 1 Aug 2003 20:30:20 +0000 (+0000)
Subject: Fix typo (& instead of &&) to fix olympic.c bug
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=288066985374bcad743c5923474257fb2c52a623;p=mesa.git

Fix typo (& instead of &&) to fix olympic.c bug
---

diff --git a/src/mesa/tnl/t_imm_exec.c b/src/mesa/tnl/t_imm_exec.c
index c71c2da1a0e..38108785a12 100644
--- a/src/mesa/tnl/t_imm_exec.c
+++ b/src/mesa/tnl/t_imm_exec.c
@@ -147,7 +147,7 @@ void _tnl_copy_to_current( GLcontext *ctx, struct immediate *IM,
    if (flag & VERT_BIT_EDGEFLAG)
       ctx->Current.EdgeFlag = IM->EdgeFlag[count];
 
-   if ((flag & VERT_BIT_COLOR0) & ctx->Light.ColorMaterialEnabled) {
+   if ((flag & VERT_BIT_COLOR0) && ctx->Light.ColorMaterialEnabled) {
       _mesa_update_color_material(ctx,
                                   ctx->Current.Attrib[VERT_ATTRIB_COLOR0]);
       TNL_CONTEXT(ctx)->Driver.NotifyMaterialChange( ctx );