diff options
author | Keith Whitwell <keith@tungstengraphics.com> | 2001-02-16 00:35:34 +0000 |
---|---|---|
committer | Keith Whitwell <keith@tungstengraphics.com> | 2001-02-16 00:35:34 +0000 |
commit | 2448fc7deeaa870d879de17158f243f239c05b15 (patch) | |
tree | c5d192531cdc1043b54856b9d60f6c3e8e217b33 /src/mesa/tnl/t_imm_dlist.c | |
parent | 86ca15ece74ccb5a8f4d566a4b2c8024b178d73b (diff) |
Fixed conform problems with recent material tracking change.
Remove redundant 'update_materials' stage.
Fix conform segfault with seperate specular colors in mustpass.c. These
tests still fail, however.
Diffstat (limited to 'src/mesa/tnl/t_imm_dlist.c')
-rw-r--r-- | src/mesa/tnl/t_imm_dlist.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/tnl/t_imm_dlist.c b/src/mesa/tnl/t_imm_dlist.c index c0393cec9a..c722c9629e 100644 --- a/src/mesa/tnl/t_imm_dlist.c +++ b/src/mesa/tnl/t_imm_dlist.c @@ -1,4 +1,4 @@ -/* $Id: t_imm_dlist.c,v 1.8 2001/02/15 01:33:52 keithw Exp $ */ +/* $Id: t_imm_dlist.c,v 1.9 2001/02/16 00:35:35 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -180,6 +180,8 @@ execute_compiled_cassette( GLcontext *ctx, void *data ) IM->AndFlag = node->AndFlag; IM->LastData = node->LastData; IM->LastPrimitive = node->LastPrimitive; + IM->LastMaterial = node->LastMaterial; + IM->MaterialOrMask = node->MaterialOrMask; if ((MESA_VERBOSE & VERBOSE_DISPLAY_LIST) && (MESA_VERBOSE & VERBOSE_IMMEDIATE)) |