summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-05-13 12:15:05 -0500
committerDave Parks <davep@lindenlab.com>2013-05-13 12:15:05 -0500
commit3702cb138fdb96d76a626483da924d9010e0a962 (patch)
treedf85cce5f410bb1b7b5eebce48bb4cb62dd394ce /indra/newview
parentedd63499527983e2b7afc76a9f01dd1a37c17d3a (diff)
NORSPEC-171 Fix for full bright checkbox breaking transparent objects with materials set.
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/lldrawpoolalpha.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp
index d5de5d30b0..bfb66fce22 100755
--- a/indra/newview/lldrawpoolalpha.cpp
+++ b/indra/newview/lldrawpoolalpha.cpp
@@ -442,7 +442,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask)
LLMaterial* mat = NULL;
- if (deferred_render && !LLPipeline::sUnderWaterRender)
+ if (!params.mFullbright && deferred_render && !LLPipeline::sUnderWaterRender)
{
mat = params.mMaterial;
}