From 713800a495152c5b39973a781ef3659835184d21 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Wed, 21 Aug 2002 10:39:59 +0000
Subject: update colormaterial state on swtcl wakeup

---
 src/mesa/tnl/t_context.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 );
+   }
+
 }
 
 
-- 
cgit v1.2.3