diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-05-29 18:48:55 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-05-29 18:48:55 -0500 |
| commit | 81b9a070b622e805b640ac0f632162a5a5f392ce (patch) | |
| tree | 584f3851fc2f67dce1ca2a42b92a213f5dea89bf /indra/newview/lldrawpoolmaterials.cpp | |
| parent | f3def8fce601bb29634667ab215cc5f00408ffa9 (diff) | |
| parent | 743d1a777e5c2827d50051c3f5e0942a870a6ff9 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
Diffstat (limited to 'indra/newview/lldrawpoolmaterials.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolmaterials.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolmaterials.cpp b/indra/newview/lldrawpoolmaterials.cpp index 3e0f9c9d4d..08a36bddf1 100644 --- a/indra/newview/lldrawpoolmaterials.cpp +++ b/indra/newview/lldrawpoolmaterials.cpp @@ -139,6 +139,7 @@ void LLDrawPoolMaterials::renderDeferred(S32 pass) } mShader->setMinimumAlpha(params.mAlphaMaskCutoff); + mShader->uniform1f(LLShaderMgr::EMISSIVE_BRIGHTNESS, params.mFullbright ? 1.f : 0.f); pushBatch(params, mask, TRUE); } |