diff options
| author | Brian Paul <brianp@vmware.com> | 2009-08-14 11:27:51 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-08-14 11:27:51 -0600 |
| commit | d09a19bf6e09eb0c8908e9b5378962ac17bcbc4c (patch) | |
| tree | dde75617a85679ebd80b3d86e7f2889203c8da24 /src/mesa/main/light.c | |
| parent | db598b899868ba6db8f3f525a22a45331589592e (diff) | |
| parent | 1574b05189fee1b5802024b505ba93fff345e95c (diff) | |
Merge branch 'mesa_7_5_branch'
Diffstat (limited to 'src/mesa/main/light.c')
| -rw-r--r-- | src/mesa/main/light.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c index 0f0d831fee..10c89f4368 100644 --- a/src/mesa/main/light.c +++ b/src/mesa/main/light.c @@ -528,7 +528,7 @@ _mesa_LightModeliv( GLenum pname, const GLint *params ) break; default: /* Error will be caught later in gl_LightModelfv */ - ; + ASSIGN_4V(fparam, 0.0F, 0.0F, 0.0F, 0.0F); } _mesa_LightModelfv( pname, fparam ); } @@ -1256,15 +1256,15 @@ _mesa_update_tnl_spaces( GLcontext *ctx, GLuint new_state ) ctx->Driver.LightingSpaceChange( ctx ); } else { - GLuint new_state = ctx->NewState; + GLuint new_state2 = ctx->NewState; /* Recalculate that same state only if it has been invalidated * by other statechanges. */ - if (new_state & _NEW_MODELVIEW) + if (new_state2 & _NEW_MODELVIEW) update_modelview_scale(ctx); - if (new_state & (_NEW_LIGHT|_NEW_MODELVIEW)) + if (new_state2 & (_NEW_LIGHT|_NEW_MODELVIEW)) compute_light_positions( ctx ); } } |