--- Mesa-7.4.2/src/mesa/main/texstate.c~	2009-05-11 16:46:29.000000000 +0100
+++ Mesa-7.4.2/src/mesa/main/texstate.c	2009-05-19 08:23:16.000000000 +0100
@@ -429,7 +429,7 @@
       }
       if (texObj->_Complete) {
          texUnit->_ReallyEnabled = textureBit;
-         texUnit->_Current = texObj;
+	 _mesa_reference_texobj(&texUnit->_Current, texObj);
          update_texture_compare_function(ctx, texObj);
       }
    }
--- Mesa-7.4.2/src/mesa/main/texstate.c~	2009-05-19 08:26:31.000000000 +0100
+++ Mesa-7.4.2/src/mesa/main/texstate.c	2009-05-19 15:28:53.000000000 +0100
@@ -485,7 +485,6 @@
       GLbitfield enableBits;
       GLuint tex;
 
-      texUnit->_Current = NULL;
       texUnit->_ReallyEnabled = 0;
       texUnit->_GenFlags = 0;