diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-07-23 11:36:25 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-07-23 11:36:25 -0700 |
| commit | 18c7ef32762a6c23fdb1dfe875669fd9ebab0bfe (patch) | |
| tree | b19edbb746c8e020d4bc58e72ae0630f244fd399 | |
| parent | d8102b2c5c0c925064356006aa7f2f6081fc6852 (diff) | |
Fix regression causing fullbright alpha-masked objects to be opaque
| -rwxr-xr-x | indra/newview/llviewershadermgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index c24284fda2..ad29c413e5 100755 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -1612,7 +1612,7 @@ BOOL LLViewerShaderMgr::loadShadersDeferred() gDeferredFullbrightAlphaMaskProgram.mShaderFiles.clear(); gDeferredFullbrightAlphaMaskProgram.mShaderFiles.push_back(make_pair("deferred/fullbrightV.glsl", GL_VERTEX_SHADER_ARB)); gDeferredFullbrightAlphaMaskProgram.mShaderFiles.push_back(make_pair("deferred/fullbrightF.glsl", GL_FRAGMENT_SHADER_ARB)); - gDeferredFullbrightAlphaMaskWaterProgram.addPermutation("HAS_ALPHA_MASK","1"); + gDeferredFullbrightAlphaMaskProgram.addPermutation("HAS_ALPHA_MASK","1"); gDeferredFullbrightAlphaMaskProgram.mShaderLevel = mVertexShaderLevel[SHADER_DEFERRED]; success = gDeferredFullbrightAlphaMaskProgram.createShader(NULL, NULL); } |