summaryrefslogtreecommitdiff
path: root/src/mesa/main/state.c
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2000-10-21 01:29:12 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2000-10-21 01:29:12 +0000
commiteb326f5f01ed2d904e23ada533b92d5570beafee (patch)
tree32426ce69f1a27197fa195387905a9e157c6a9c9 /src/mesa/main/state.c
parentd0d7d62120d7448924655c4683bab6bd5667256e (diff)
fixed a texture enable bug
Diffstat (limited to 'src/mesa/main/state.c')
-rw-r--r--src/mesa/main/state.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index bc0e014213..3bdd3f58d3 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -1,4 +1,4 @@
-/* $Id: state.c,v 1.32 2000/10/20 19:54:49 brianp Exp $ */
+/* $Id: state.c,v 1.33 2000/10/21 01:29:12 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -883,8 +883,11 @@ void gl_update_state( GLcontext *ctx )
ctx->Texture.MultiTextureEnabled = GL_TRUE;
}
}
+ else {
+ ctx->Texture.Unit[i].ReallyEnabled = 0;
+ }
}
-
+ ctx->Enabled = (ctx->Enabled & ~ENABLE_TEX_ANY) | ctx->Texture.ReallyEnabled;
ctx->NeedNormals = (ctx->Light.Enabled || ctx->Texture.NeedNormals);
}