From ddad6dd5ea88705a0b7db603e1785715593624de Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Tue, 4 May 2010 14:55:02 +0100 Subject: EXT-7161 Fullbright has no effect on shiny & bump mapped prim while Lighting and Shadows are enabled. (transplanted from 6f25e5a4f0e0d7bbe1ed3e14e7da4d371e290c67) --- indra/newview/llvovolume.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview') 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 { -- cgit v1.2.3