diff options
| author | marha <marha@users.sourceforge.net> | 2012-05-14 16:52:51 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-05-14 16:52:51 +0200 |
| commit | 1a71b50696cc230cd055905a5f9fdbd3fa7c89af (patch) | |
| tree | 23d0afa2e1458a54c656116205e485900e8edd9d /mesalib/src/mesa/main/light.c | |
| parent | 13a63d4f69c0692539448cb3d8e4a0e1ffdf2183 (diff) | |
| download | vcxsrv-1a71b50696cc230cd055905a5f9fdbd3fa7c89af.tar.gz vcxsrv-1a71b50696cc230cd055905a5f9fdbd3fa7c89af.tar.bz2 vcxsrv-1a71b50696cc230cd055905a5f9fdbd3fa7c89af.zip | |
fontconfig libX11 mesa xkeyboard-config pixman git update 14 May 2012
Diffstat (limited to 'mesalib/src/mesa/main/light.c')
| -rw-r--r-- | mesalib/src/mesa/main/light.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/light.c b/mesalib/src/mesa/main/light.c index 7bc22e2fa..38ec1b6e8 100644 --- a/mesalib/src/mesa/main/light.c +++ b/mesalib/src/mesa/main/light.c @@ -728,6 +728,8 @@ _mesa_ColorMaterial( GLenum face, GLenum mode ) _mesa_lookup_enum_by_nr(mode)); bitmask = _mesa_material_bitmask(ctx, face, mode, legal, "glColorMaterial"); + if (bitmask == 0) + return; /* error was recorded */ if (ctx->Light.ColorMaterialBitmask == bitmask && ctx->Light.ColorMaterialFace == face && |