diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-06-05 12:38:27 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-06-05 12:38:27 -0500 |
| commit | 2c46363bfdd6653f492eec831f394ad1f6a52b0e (patch) | |
| tree | 6c4de4109be33187267e68e7f97206b5ee0e29ae /indra/newview/llviewershadermgr.cpp | |
| parent | 8d4864750e151a2807c78c644eb5af832a869565 (diff) | |
| parent | e454c3d48cbefd37de0564a5ba85e0d127850456 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
| -rwxr-xr-x | indra/newview/llviewershadermgr.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 9284fb1587..9e2a0d74db 100755 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -2581,7 +2581,6 @@ BOOL LLViewerShaderMgr::loadShadersObject() gSkinnedObjectSimpleWaterProgram.mFeatures.hasWaterFog = true; gSkinnedObjectSimpleWaterProgram.mShaderGroup = LLGLSLShader::SG_WATER; gSkinnedObjectSimpleWaterProgram.mFeatures.hasObjectSkinning = true; - gSkinnedObjectSimpleWaterProgram.mFeatures.hasAlphaMask = true; gSkinnedObjectSimpleWaterProgram.mFeatures.disableTextureIndex = true; gSkinnedObjectSimpleWaterProgram.mShaderFiles.clear(); gSkinnedObjectSimpleWaterProgram.mShaderFiles.push_back(make_pair("objects/simpleSkinnedV.glsl", GL_VERTEX_SHADER_ARB)); |