diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-05-23 12:49:23 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-05-23 12:49:23 -0500 |
| commit | e6de3d6232a12ace8f669abd4ede4c6f586046df (patch) | |
| tree | bd82478ab3e39ad0caf655806960975c86bb141d /indra/newview/lldrawpoolmaterials.cpp | |
| parent | 74a84738ed8779e345f34b95f029862b3c9ccf6e (diff) | |
| parent | 6a9564eeadf54937a63d60e265cf304e6f81dc01 (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); } |