summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2013-06-19 15:13:19 -0700
committerGraham Linden <graham@lindenlab.com>2013-06-19 15:13:19 -0700
commit504b83400037f1c77731007443f5420b877d6877 (patch)
tree07f47657a9ccc746e6221035bc93c1fa8b78642a
parente71b415841278f3719ff49b5c84969c64444d586 (diff)
parenta29a18eb97e93a2bb2749dca322e99b1180c4a91 (diff)
Merge
-rwxr-xr-xindra/newview/pipeline.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 24718d9077..56a3ebe3a8 100755
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -2452,8 +2452,8 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl
}
else
{
- mScreen.bindTarget();
- }
+ mScreen.bindTarget();
+ }
}
if (sUseOcclusion > 1)
@@ -2597,10 +2597,10 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl
}
else
{
- mScreen.flush();
+ mScreen.flush();
+ }
}
}
-}
void LLPipeline::markNotCulled(LLSpatialGroup* group, LLCamera& camera)
{
@@ -8321,7 +8321,7 @@ void LLPipeline::renderDeferredLighting()
LLStrider<LLVector3> vert;
mDeferredVB->getVertexStrider(vert);
-
+
vert[0].set(-1,1,0);
vert[1].set(-1,-3,0);
vert[2].set(3,1,0);