diff options
author | Graham Madarasz <graham@lindenlab.com> | 2013-05-01 08:11:15 -0700 |
---|---|---|
committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-01 08:11:15 -0700 |
commit | 025c8909582f59f68f786d52bea06f5a272df0b5 (patch) | |
tree | 6d9980e216f89c74776155432b32e6778f3b6367 /indra/newview/llvovolume.cpp | |
parent | 536a30d7f2083d39dbd6d06f16fa53064c3ee379 (diff) | |
parent | 70c1e21956b8589c9873ac5fa6a05467dc2e0a89 (diff) |
Merge vwr-dev-mat
Diffstat (limited to 'indra/newview/llvovolume.cpp')
-rwxr-xr-x | indra/newview/llvovolume.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 03c7441d93..a08a8a9676 100755 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -5386,7 +5386,7 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std:: } else { - registerFace(group, facep, LLRenderPass::PASS_FULLBRIGHT); + registerFace(group, facep, LLRenderPass::PASS_FULLBRIGHT); } if (LLPipeline::sRenderDeferred && !hud_group && LLPipeline::sRenderBump && te->getBumpmap()) { //if this is the deferred render and a bump map is present, register in post deferred bump @@ -5408,10 +5408,10 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std:: } else { - registerFace(group, facep, LLRenderPass::PASS_SIMPLE); + registerFace(group, facep, LLRenderPass::PASS_SIMPLE); + } } } - } if (!gPipeline.canUseVertexShaders() && |