From 09b5534741ec7001a347c392969fe86682f24c27 Mon Sep 17 00:00:00 2001
From: Ptolemy <ptolemy@lindenlab.com>
Date: Thu, 5 Nov 2020 20:16:56 -0800
Subject: [PATCH] SL-14275: Cleanup inconsistent indentation
---
indra/newview/pipeline.cpp | 43 +++++++++++++++++++-------------------
1 file changed, 22 insertions(+), 21 deletions(-)
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 36037415e7e..a471cef89f7 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -9302,8 +9302,8 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
S32 occlusion = LLPipeline::sUseOcclusion;
- //disable occlusion culling for reflection map for now
- LLPipeline::sUseOcclusion = 0;
+ //disable occlusion culling for reflection map for now
+ LLPipeline::sUseOcclusion = 0;
if (!camera_is_underwater)
{ //generate planar reflection map
@@ -9352,7 +9352,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
updateCull(camera, mSky);
stateSort(camera, mSky);
- renderGeom(camera, TRUE);
+ renderGeom(camera, TRUE);
gPipeline.popRenderTypeMask();
}
@@ -9385,11 +9385,12 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
LLGLDisable cull(GL_CULL_FACE);
updateCull(camera, mReflectedObjects, -water_clip, &plane);
stateSort(camera, mReflectedObjects);
- renderGeom(camera);
- }
+ renderGeom(camera);
+ }
+
gPipeline.popRenderTypeMask();
mWaterRef.flush();
- }
+ }
glCullFace(GL_BACK);
gGL.matrixMode(LLRender::MM_MODELVIEW);
@@ -9435,12 +9436,12 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
LLPipeline::sDistortionRender = true;
LLColor3 col = LLEnvironment::instance().getCurrentWater()->getWaterFogColor();
- glClearColor(col.mV[0], col.mV[1], col.mV[2], 0.f);
+ glClearColor(col.mV[0], col.mV[1], col.mV[2], 0.f);
- LLViewerCamera::sCurCameraID = LLViewerCamera::CAMERA_WATER1;
+ LLViewerCamera::sCurCameraID = LLViewerCamera::CAMERA_WATER1;
mWaterDis.bindTarget();
- mWaterDis.getViewport(gGLViewport);
+ mWaterDis.getViewport(gGLViewport);
F32 water_dist = water_height * LLPipeline::sDistortionWaterClipPlaneMargin;
@@ -9461,19 +9462,19 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
updateCull(camera, mRefractedObjects, water_clip, &plane);
stateSort(camera, mRefractedObjects);
- renderGeom(camera);
+ renderGeom(camera);
- if (LLGLSLShader::sNoFixedFunction)
- {
- gUIProgram.bind();
- }
-
- LLWorld::getInstance()->renderPropertyLines();
-
- if (LLGLSLShader::sNoFixedFunction)
- {
- gUIProgram.unbind();
- }
+ if (LLGLSLShader::sNoFixedFunction)
+ {
+ gUIProgram.bind();
+ }
+
+ LLWorld::getInstance()->renderPropertyLines();
+
+ if (LLGLSLShader::sNoFixedFunction)
+ {
+ gUIProgram.unbind();
+ }
mWaterDis.flush();
}
--
GitLab