diff options
| author | Brian <brian@yutani.localnet.net> | 2007-03-26 11:30:05 -0600 |
|---|---|---|
| committer | Brian <brian@yutani.localnet.net> | 2007-03-26 11:30:05 -0600 |
| commit | 38a1c2b4959d35236933c14d3944cce94283ca30 (patch) | |
| tree | c82629e61cc04ad279deaeae578bc5e584d425ce /src/mesa/swrast/s_bitmap.c | |
| parent | b5d988dd19291e4e1e6f18e4163c2acac66729de (diff) | |
Add _swrast_span_default_secondary_color() for use with glBitmap, glDrawPixels, etc.
Secondary color wasn't getting added to post-texture color when drawing
bitmaps, images. See bug 10409.
Diffstat (limited to 'src/mesa/swrast/s_bitmap.c')
| -rw-r--r-- | src/mesa/swrast/s_bitmap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/swrast/s_bitmap.c b/src/mesa/swrast/s_bitmap.c index 25a1ef89d0..59c42e524f 100644 --- a/src/mesa/swrast/s_bitmap.c +++ b/src/mesa/swrast/s_bitmap.c @@ -85,6 +85,8 @@ _swrast_Bitmap( GLcontext *ctx, GLint px, GLint py, INIT_SPAN(span, GL_BITMAP, width, 0, SPAN_XY); _swrast_span_default_color(ctx, &span); + if (ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR) + _swrast_span_default_secondary_color(ctx, &span); if (ctx->Depth.Test) _swrast_span_default_z(ctx, &span); if (swrast->_FogEnabled) |