diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-28 08:12:11 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-28 08:12:11 +0200 |
| commit | 4376eeccc64a10e2a74fd0eb4184d2a144058470 (patch) | |
| tree | 6a55f2d7660286e3250038228fa33d1fa1d0017e /mesalib/src/mesa/vbo/vbo_exec_api.c | |
| parent | 74a24d67cefc273c717f17150b9d41607bcaf8ce (diff) | |
| parent | 67551627d34fff4a0fbe719bce33a3bacb55ccef (diff) | |
| download | vcxsrv-4376eeccc64a10e2a74fd0eb4184d2a144058470.tar.gz vcxsrv-4376eeccc64a10e2a74fd0eb4184d2a144058470.tar.bz2 vcxsrv-4376eeccc64a10e2a74fd0eb4184d2a144058470.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/vbo/vbo_exec_api.c')
| -rw-r--r-- | mesalib/src/mesa/vbo/vbo_exec_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/vbo/vbo_exec_api.c b/mesalib/src/mesa/vbo/vbo_exec_api.c index bfa1b1db8..fc7e40692 100644 --- a/mesalib/src/mesa/vbo/vbo_exec_api.c +++ b/mesalib/src/mesa/vbo/vbo_exec_api.c @@ -450,7 +450,7 @@ vbo_Materialfv(GLenum face, GLenum pname, const GLfloat *params) * indicating which material attributes can actually be updated below. */ if (ctx->Light.ColorMaterialEnabled) { - updateMats = ~ctx->Light.ColorMaterialBitmask; + updateMats = ~ctx->Light._ColorMaterialBitmask; } else { /* GL_COLOR_MATERIAL is disabled so don't skip any material updates */ |