diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-05-13 23:05:39 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-05-13 23:05:39 -0500 |
| commit | e1db8d4191d3b33dc6098a656661a08b54d68df5 (patch) | |
| tree | 125a6f6ac0471d78c3d8277e77bc3e6c9eea14df /indra/newview/lldrawpoolalpha.cpp | |
| parent | d9e8ee7cfd323872145c23e4032989f9b7770f55 (diff) | |
| parent | dc38ef5d3922829873b95de9f4696f74b48fc472 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
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; } |