summaryrefslogtreecommitdiff
path: root/src/mesa/tnl
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2002-08-21 10:39:59 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2002-08-21 10:39:59 +0000
commit713800a495152c5b39973a781ef3659835184d21 (patch)
treec87aa644c7edc02ff0384aaca7ba3dfa4f2826f2 /src/mesa/tnl
parent2b930072b382fc7b8bf284bd8d341bf8f09ad1e7 (diff)
update colormaterial state on swtcl wakeup
Diffstat (limited to 'src/mesa/tnl')
-rw-r--r--src/mesa/tnl/t_context.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c
index 9d000d0528..676eb4736e 100644
--- a/src/mesa/tnl/t_context.c
+++ b/src/mesa/tnl/t_context.c
@@ -1,4 +1,4 @@
-/* $Id: t_context.c,v 1.26 2002/04/19 12:32:14 brianp Exp $ */
+/* $Id: t_context.c,v 1.27 2002/08/21 10:39:59 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -194,6 +194,11 @@ _tnl_wakeup_exec( GLcontext *ctx )
*/
_tnl_InvalidateState( ctx, ~0 );
tnl->pipeline.run_input_changes = ~0;
+
+ if (ctx->Light.ColorMaterialEnabled) {
+ _mesa_update_color_material( ctx, ctx->Current.Color );
+ }
+
}