Make sure tnl->_DoVertexFog is kept uptodate. Fixes fog in i915

[mesa.git] / progs / demos / multiarb.c

diff --git a/progs/demos/multiarb.c b/progs/demos/multiarb.c
index 239efac6633b700412d007c617ee129d74d77bea..d963985c69de0012520a52de4a8eb2fb5e922a37 100644 (file)
--- a/progs/demos/multiarb.c
+++ b/progs/demos/multiarb.c
@@ -1,4 +1,3 @@
-/* $Id: multiarb.c,v 1.12 2003/05/30 15:30:17 brianp Exp $ */
 
 /*
  * GL_ARB_multitexture demo
@@ -18,7 +17,7 @@
 #include <string.h>
 #include <GL/glut.h>
 
-#include "readtex.c"   /* I know, this is a hack. */
+#include "readtex.h"
 
 #define TEXTURE_1_FILE "../images/girl.rgb"
 #define TEXTURE_2_FILE "../images/reflect.rgb"
@@ -37,7 +36,6 @@ static GLfloat drift_increment = 0.005;
 static GLfloat Xrot = 20.0, Yrot = 30.0, Zrot = 0.0;
 
 
-
 static void Idle( void )
 {
    if (Animate) {
@@ -53,7 +51,7 @@ static void Idle( void )
          glLoadIdentity();
          if (i == 0) {
             glTranslatef(Drift, 0.0, 0.0);
-            glScalef(2, 2, 2);
+            glScalef(2, 2, 1);
          }
          else if (i == 1) {
             glTranslatef(0.0, Drift, 0.0);