diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-14 15:27:53 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-14 15:27:53 -0700 |
| commit | 5dc7012f43238ce216469bfc4f6ec7e5dc476894 (patch) | |
| tree | 9c571e0cadb7b26e9b6db8bdf6e46e7b196fb271 /indra/newview/lldrawpoolalpha.cpp | |
| parent | a37bff8bf1add5afe154b25156d7ebe38ff9af31 (diff) | |
| parent | be712ba6b56bc087c947203290d172275aa975d9 (diff) | |
Merge
Diffstat (limited to 'indra/newview/lldrawpoolalpha.cpp')
| -rwxr-xr-x | indra/newview/lldrawpoolalpha.cpp | 2 |
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; } |