summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2018-09-18 21:54:38 +0100
committerGraham Linden <graham@lindenlab.com>2018-09-18 21:54:38 +0100
commitc9b2759469cb090b76a7d602eb876659c305c7f3 (patch)
tree83567181f2494a6c1614b24ae680a808637dea50 /indra/newview/pipeline.cpp
parent030afe0aaa0c956caa5509bca433c056eaf284fd (diff)
SL-1475
Make stars use higher alpha and brighten reflected color before mixing to get stars to show up in reflections on water.
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r--indra/newview/pipeline.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 1522403990..c722c442f1 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -339,6 +339,7 @@ bool LLPipeline::sRenderFrameTest = false;
bool LLPipeline::sRenderAttachedLights = true;
bool LLPipeline::sRenderAttachedParticles = true;
bool LLPipeline::sRenderDeferred = false;
+bool LLPipeline::sRenderingWaterReflection = false;
bool LLPipeline::sMemAllocationThrottled = false;
S32 LLPipeline::sVisibleLightCount = 0;
F32 LLPipeline::sMinRenderSize = 0.f;
@@ -9838,6 +9839,8 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
if (!LLViewerCamera::getInstance()->cameraUnderWater())
{ //generate planar reflection map
+ LLPipeline::sRenderingWaterReflection = true;
+
//disable occlusion culling for reflection map for now
S32 occlusion = LLPipeline::sUseOcclusion;
LLPipeline::sUseOcclusion = 0;
@@ -9972,6 +9975,9 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
gPipeline.popRenderTypeMask();
}
+
+ LLPipeline::sRenderingWaterReflection = false;
+
glCullFace(GL_BACK);
gGL.popMatrix();
mWaterRef.flush();