diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-04 14:55:02 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-04 14:55:02 +0100 |
| commit | 447bffcb532694fcc3bc3b046051f02ac4550fd3 (patch) | |
| tree | 15f0c3b9f70d417abf77d04d0c1f43381b5d3875 /indra/newview | |
| parent | 5b405a6a8cb961637ef1c063316f8cb97a2a7bc4 (diff) | |
EXT-7161 Fullbright has no effect on shiny & bump mapped prim while Lighting and Shadows are enabled.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index aa22dc7f5d..34ae915a07 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -3802,13 +3802,13 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std:: } else if (LLPipeline::sRenderDeferred) { - if (te->getBumpmap()) + if (te->getFullbright()) { - registerFace(group, facep, LLRenderPass::PASS_BUMP); + registerFace(group, facep, LLRenderPass::PASS_FULLBRIGHT_SHINY); } - else if (te->getFullbright()) + else if (te->getBumpmap()) { - registerFace(group, facep, LLRenderPass::PASS_FULLBRIGHT_SHINY); + registerFace(group, facep, LLRenderPass::PASS_BUMP); } else { |