From ff56908e09c0351179478deb19677cf56eec1f64 Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Tue, 5 Aug 2003 18:55:49 +0000 Subject: Store material attributes in an Attrib[] style array. This is a first step to reviving/rescuing the 'vtx' rework from the old mesa tree. --- src/mesa/tnl/t_imm_exec.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/mesa/tnl/t_imm_exec.c') diff --git a/src/mesa/tnl/t_imm_exec.c b/src/mesa/tnl/t_imm_exec.c index 38108785a1..f1d6ee8925 100644 --- a/src/mesa/tnl/t_imm_exec.c +++ b/src/mesa/tnl/t_imm_exec.c @@ -154,9 +154,11 @@ void _tnl_copy_to_current( GLcontext *ctx, struct immediate *IM, } if (flag & VERT_BIT_MATERIAL) { - _mesa_update_material( ctx, - IM->Material[IM->LastMaterial], - IM->MaterialOrMask ); + _mesa_copy_materials( &ctx->Light.Material, + &IM->Material[IM->LastMaterial], + IM->MaterialOrMask ); + + _mesa_update_material( ctx, IM->MaterialOrMask ); TNL_CONTEXT(ctx)->Driver.NotifyMaterialChange( ctx ); } -- cgit v1.2.3