diff options
| author | Brian Paul <[email protected]> | 2006-11-20 15:14:35 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2006-11-20 15:14:35 +0000 |
| commit | 7cc5522f86026a5058e4594a51685e96de2ca91a (patch) | |
| tree | e76a2744325819bb013a8975b992ac11248732cd /src/mesa/main/attrib.c | |
| parent | d2fc1c8384da403930e8d4b9ca95da55846d1696 (diff) | |
fix glPopAttrib/color material bug #9091
Diffstat (limited to 'src/mesa/main/attrib.c')
| -rw-r--r-- | src/mesa/main/attrib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index e22edc1bbcf..9993a0021bc 100644 --- a/src/mesa/main/attrib.c +++ b/src/mesa/main/attrib.c @@ -1,6 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 6.5.1 + * Version: 6.5.2 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * @@ -1009,9 +1009,6 @@ _mesa_PopAttrib(void) (GLfloat) light->Model.TwoSide); _mesa_LightModelf(GL_LIGHT_MODEL_COLOR_CONTROL, (GLfloat) light->Model.ColorControl); - /* materials */ - MEMCPY(&ctx->Light.Material, &light->Material, - sizeof(struct gl_material)); /* shade model */ _mesa_ShadeModel(light->ShadeModel); /* color material */ @@ -1019,6 +1016,9 @@ _mesa_PopAttrib(void) light->ColorMaterialMode); _mesa_set_enable(ctx, GL_COLOR_MATERIAL, light->ColorMaterialEnabled); + /* materials */ + MEMCPY(&ctx->Light.Material, &light->Material, + sizeof(struct gl_material)); } break; case GL_LINE_BIT: |