projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2b93007
)
update colormaterial state on swtcl wakeup
author
Keith Whitwell
<keith@tungstengraphics.com>
Wed, 21 Aug 2002 10:39:59 +0000
(10:39 +0000)
committer
Keith Whitwell
<keith@tungstengraphics.com>
Wed, 21 Aug 2002 10:39:59 +0000
(10:39 +0000)
src/mesa/tnl/t_context.c
patch
|
blob
|
history
diff --git
a/src/mesa/tnl/t_context.c
b/src/mesa/tnl/t_context.c
index 9d000d05280e0f74bebfd79aeb7a4e60e64e2f41..676eb4736e3f017d02f3a8a66ee147c11f1f24a0 100644
(file)
--- a/
src/mesa/tnl/t_context.c
+++ b/
src/mesa/tnl/t_context.c
@@
-1,4
+1,4
@@
-/* $Id: t_context.c,v 1.2
6 2002/04/19 12:32:14 brianp
Exp $ */
+/* $Id: t_context.c,v 1.2
7 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 );
+ }
+
}