Don't let FragmentProgram._Active influence choice of vertex vs pixel

fog.

diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index 00c4ae4..4a4d1b8 100644 (file)
--- a/src/mesa/swrast/s_context.c
+++ b/src/mesa/swrast/s_context.c
@@ -158,7 +158,7 @@ _swrast_update_fog_hint( GLcontext *ctx )
 {
    SWcontext *swrast = SWRAST_CONTEXT(ctx);
    swrast->_PreferPixelFog = (!swrast->AllowVertexFog ||
-                              ctx->FragmentProgram._Active ||
+                              ctx->FragmentProgram._Enabled || /* not _Active! */
                              (ctx->Hint.Fog == GL_NICEST &&
                               swrast->AllowPixelFog));
 }