diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2000-11-24 15:21:59 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2000-11-24 15:21:59 +0000 |
| commit | 9aff6cfdc37f83a2528463179ad0b50893bf0c58 (patch) | |
| tree | 0bb5482717e276ab6b95b47ba2eb3ff8685094bf /src/mesa/main/light.c | |
| parent | 65dcc30599348c2bfd7952b888db27edd1670fc6 (diff) | |
| download | external_mesa3d-9aff6cfdc37f83a2528463179ad0b50893bf0c58.zip external_mesa3d-9aff6cfdc37f83a2528463179ad0b50893bf0c58.tar.gz external_mesa3d-9aff6cfdc37f83a2528463179ad0b50893bf0c58.tar.bz2 | |
Fixed a couple of bugs that crept into last commit
- Eval not compiled correctly
- Material colors computed incorrectly
Reworked the VERT_TEX flags, now support upto 12 texture units in tnl.
Diffstat (limited to 'src/mesa/main/light.c')
| -rw-r--r-- | src/mesa/main/light.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c index af274ea..07571cd 100644 --- a/src/mesa/main/light.c +++ b/src/mesa/main/light.c @@ -1,4 +1,4 @@ -/* $Id: light.c,v 1.28 2000/11/24 10:25:05 keithw Exp $ */ +/* $Id: light.c,v 1.29 2000/11/24 15:21:59 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -601,14 +601,14 @@ void gl_update_material( GLcontext *ctx, struct gl_material *mat = &ctx->Light.Material[0]; COPY_4FV( mat->Specular, src[0].Specular ); foreach (light, list) { - ACC_SCALE_3V( light->_MatSpecular[0], light->Specular, mat->Specular); + SCALE_3V( light->_MatSpecular[0], light->Specular, mat->Specular); } } if (bitmask & BACK_SPECULAR_BIT) { struct gl_material *mat = &ctx->Light.Material[1]; COPY_4FV( mat->Specular, src[1].Specular ); foreach (light, list) { - ACC_SCALE_3V( light->_MatSpecular[1], light->Specular, mat->Specular); + SCALE_3V( light->_MatSpecular[1], light->Specular, mat->Specular); } } |