fix GL_BACK color material bug

[mesa.git] / src / mesa / main / light.c

diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c
index d8cfd20bde8067143d91cb5158b9302311d1adcb..f7278c2c31aeb654b337ccff06e7bfdb970b70e2 100644 (file)
--- a/src/mesa/main/light.c
+++ b/src/mesa/main/light.c
@@ -1,4 +1,4 @@
-/* $Id: light.c,v 1.11 2000/01/13 00:29:02 brianp Exp $ */
+/* $Id: light.c,v 1.13 2000/06/19 14:35:17 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -43,6 +43,11 @@
 #endif
 
 
+/* XXX this is a bit of a hack needed for compilation within XFree86 */
+#ifndef FLT_MIN
+#define FLT_MIN 1e-37
+#endif
+
 
 void
 _mesa_ShadeModel( GLenum mode )
@@ -688,7 +693,7 @@ void gl_update_color_material( GLcontext *ctx,
       SUB_3V( tmp, color, mat->Ambient );
       ACC_SCALE_3V( ctx->Light.BaseColor[1], ctx->Light.Model.Ambient, tmp);
       foreach (light, list) {
-        ACC_SCALE_3V( ctx->Light.BaseColor[0], light->Ambient, tmp );
+        ACC_SCALE_3V( ctx->Light.BaseColor[1], light->Ambient, tmp );
       }
       COPY_4FV( mat->Ambient, color );
    }