diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2016-12-17 11:09:48 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2016-12-17 11:09:48 -0500 |
| commit | fd79bb9c7dbd0180f6dd3711450083ea2020e93f (patch) | |
| tree | fc2c44ecb5e5898ead563d82976b14e7a97dff03 /indra/llrender/llshadermgr.cpp | |
| parent | 129896106638884ff41bdcd8441a5bcc221aa580 (diff) | |
| parent | 4c95587dc3c0943d3cf455df6ecb5c7dcbf78738 (diff) | |
DRTVWR-418: Merge backout of TYPE_INDEX / TYPE_MAX change
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 0a479feccc..55f0791174 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -986,8 +986,7 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedAttribs.push_back("weight4"); mReservedAttribs.push_back("clothing"); mReservedAttribs.push_back("texture_index"); - mReservedAttribs.push_back("index"); - + //matrix state mReservedUniforms.push_back("modelview_matrix"); mReservedUniforms.push_back("projection_matrix"); |