diff options
| author | Keith Whitwell <[email protected]> | 2003-08-01 20:30:20 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2003-08-01 20:30:20 +0000 |
| commit | 288066985374bcad743c5923474257fb2c52a623 (patch) | |
| tree | 4c449389687662779816af1a23bcbd4dab917f43 | |
| parent | 1a615070ed959359c949aecc3b52a199b999b2a5 (diff) | |
Fix typo (& instead of &&) to fix olympic.c bug
| -rw-r--r-- | src/mesa/tnl/t_imm_exec.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 ); |