diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-09-18 15:13:52 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-09-18 15:13:52 -0700 |
| commit | 8d627de47874660b6781e24f801200f590cd084a (patch) | |
| tree | 54275be3ca57ea64fb1bcc0adbdd26267bf56ecd /indra/newview/pipeline.cpp | |
| parent | 616b1e8ec1c14f04661a42c2c4cbf6410bdfac38 (diff) | |
| parent | c9b2759469cb090b76a7d602eb876659c305c7f3 (diff) | |
Merge
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 6 |
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(); |