diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2019-05-31 21:53:44 +0000 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2019-05-31 21:53:44 +0000 |
| commit | 57116089d07332247b2fe76ae8b17888df350110 (patch) | |
| tree | 5b311f33295af892d2cf3725e274c535c853a471 | |
| parent | b27aa056a0dca761edfa2f58c8ddfee7de8f8f04 (diff) | |
| parent | b507392b780d58159de426c0827422f198997c22 (diff) | |
Merged in graham_linden/viewer-eep-g (pull request #411)
Fix callsites missed for func w/ changed signature.
| -rw-r--r-- | indra/newview/pipeline.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 50970293ef..045e87f91d 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -7532,7 +7532,7 @@ void LLPipeline::renderBloom(bool for_snapshot, F32 zoom_factor, int subfield) LLGLDisable blend(GL_BLEND); LLGLDisable cull(GL_CULL_FACE); - enableLightsFullbright(LLColor4(1,1,1,1)); + enableLightsFullbright(); gGL.matrixMode(LLRender::MM_PROJECTION); gGL.pushMatrix(); @@ -7574,7 +7574,7 @@ void LLPipeline::renderBloom(bool for_snapshot, F32 zoom_factor, int subfield) mScreen.bindTexture(0, 0, LLTexUnit::TFO_POINT); gGL.color4f(1,1,1,1); - gPipeline.enableLightsFullbright(LLColor4(1,1,1,1)); + gPipeline.enableLightsFullbright(); gGL.begin(LLRender::TRIANGLE_STRIP); gGL.texCoord2f(tc1.mV[0], tc1.mV[1]); gGL.vertex2f(-1,-1); |