diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-04-03 12:07:59 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-04-03 12:07:59 -0700 |
| commit | a698b5168195caca4c2863d057cc2e7b4938353d (patch) | |
| tree | e0778cd4b9a32c3226f729164411ebaf5dccaacf | |
| parent | 98f71bb8e4cd94c29a1b728147d8507f3a74c3a2 (diff) | |
Replace MAINT-8836 fix dropped in merge of 6.1.2
| -rw-r--r-- | indra/newview/llviewershadermgr.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index dc38339e6e..caef1df2cd 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -2621,6 +2621,7 @@ BOOL LLViewerShaderMgr::loadShadersObject() gObjectSimpleNonIndexedProgram.mFeatures.hasGamma = true; gObjectSimpleNonIndexedProgram.mFeatures.hasAtmospherics = true; gObjectSimpleNonIndexedProgram.mFeatures.hasLighting = true; + gObjectSimpleNonIndexedProgram.mFeatures.hasAlphaMask = true; // Fix for MAINT-8836 gObjectSimpleNonIndexedProgram.mFeatures.disableTextureIndex = true; gObjectSimpleNonIndexedProgram.mShaderFiles.clear(); gObjectSimpleNonIndexedProgram.mShaderFiles.push_back(make_pair("objects/simpleV.glsl", GL_VERTEX_SHADER_ARB)); |