diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-11-11 11:40:19 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-11-11 11:40:19 -0800 |
| commit | 4ea33a3b3cb7fa06cd3f84cbdc866cc8ad9bdefa (patch) | |
| tree | 753588ae96193cf376ec16f759bd12ea4407afdb /indra/llrender/llshadermgr.cpp | |
| parent | b31f7381ae85a0aa6c4d9e93b1d8bac5854fdd01 (diff) | |
| parent | 2301cf800f40101baed7a5936683d0b1e4968be1 (diff) | |
Pull merge from lindenlanb/viewer-release
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
| -rwxr-xr-x | indra/llrender/llshadermgr.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 95a2c8b589..a89ec675b4 100755 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -73,7 +73,11 @@ BOOL LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader) { llassert_always(shader != NULL); LLShaderFeatures *features = & shader->mFeatures; - + + if (features->attachNothing) + { + return TRUE; + } ////////////////////////////////////// // Attach Vertex Shader Features First ////////////////////////////////////// |