From f07b8c194447be4753512716402993888b2ed98c 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. --- 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 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 { -- cgit v1.2.3