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 | ddad6dd5ea88705a0b7db603e1785715593624de (patch) | |
| tree | 7d0ebbba06a81ce4e509784f29bf4d41464c893e /indra/newview/llvovolume.cpp | |
| parent | 61403b1ecc748d03ec1f94eb56a6d1a701f6dcc5 (diff) | |
EXT-7161 Fullbright has no effect on shiny & bump mapped prim while Lighting and Shadows are enabled.
(transplanted from 6f25e5a4f0e0d7bbe1ed3e14e7da4d371e290c67)
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -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 220634897e..f71c3ce418 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -4060,13 +4060,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 { |