diff options
| author | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2018-07-19 13:02:32 +0000 |
|---|---|---|
| committer | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2018-07-19 13:02:32 +0000 |
| commit | f82443dd5541b4ec1cc30acb9dd4ba3375687d10 (patch) | |
| tree | fd12ad370f386467e7d61915a8fe2e353a52ba03 /indra | |
| parent | c877eac422dc0d1116547d4cb83e618f0b5b6741 (diff) | |
| parent | 6e03f2b4b5d6fcc6e26193185f2fe58f52d12598 (diff) | |
Merged in ruslantproductengine/viewer-cougar-4cr-2 (pull request #15)
MAINT-8836 - Objects with Alpha Masking > 0 do not rendering correctly on avatar
Approved-by: Graham Madarasz <graham@lindenlab.com>
Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
Approved-by: Simon Linden <simon@lindenlab.com>
Diffstat (limited to 'indra')
| -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 ff7647a7e4..d2acfa291c 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -2065,6 +2065,7 @@ BOOL LLViewerShaderMgr::loadShadersObject() gObjectSimpleNonIndexedProgram.mFeatures.hasAtmospherics = true; gObjectSimpleNonIndexedProgram.mFeatures.hasLighting = true; gObjectSimpleNonIndexedProgram.mFeatures.disableTextureIndex = true; + gObjectSimpleNonIndexedProgram.mFeatures.hasAlphaMask = true; gObjectSimpleNonIndexedProgram.mShaderFiles.clear(); gObjectSimpleNonIndexedProgram.mShaderFiles.push_back(make_pair("objects/simpleV.glsl", GL_VERTEX_SHADER_ARB)); gObjectSimpleNonIndexedProgram.mShaderFiles.push_back(make_pair("objects/simpleF.glsl", GL_FRAGMENT_SHADER_ARB)); |