From 288066985374bcad743c5923474257fb2c52a623 Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Fri, 1 Aug 2003 20:30:20 +0000 Subject: Fix typo (& instead of &&) to fix olympic.c bug --- src/mesa/tnl/t_imm_exec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/mesa/tnl/t_imm_exec.c b/src/mesa/tnl/t_imm_exec.c index c71c2da1a0..38108785a1 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 ); -- cgit v1.2.3