mesa: Changes to 'master'

[Roland Scheidegger]

 src/mesa/main/texenvprogram.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit diffs at http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=summary

New commits:
commit bf4a0fafc86bba8dc868cf30244a237e33645164
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Fri Feb 15 17:26:06 2008 +0100

    fix bug with generated fragment programs if vertex shader is active
    
    When generating a fragment program from fixed function, checking
    texUnit->_ReallyEnabled is not sufficient, need texUnit->Enabled too
    since the former also represents texture enables from an active vertex
    shader.