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 c71c2da1a0e009405acf373ce7a0ae9468addf0c..38108785a1231cf0bcb8200df931d599252ac0f4 100644 (file)
--- 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 );