diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-11-10 14:43:05 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-11-10 14:43:05 -0500 |
| commit | b66c7190607d8e2ac0c3d6c56c41afc81aeb7878 (patch) | |
| tree | ac6729a3ce4c310a6f55d3a31bee4d852f6dd372 /indra/llrender/llshadermgr.cpp | |
| parent | fe89c9ed76984214b21d2d37aa10ea83720af5d6 (diff) | |
| parent | 2301cf800f40101baed7a5936683d0b1e4968be1 (diff) | |
merge changes for 3.7.20-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 663d3e8b0f..b2be3cc3b6 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 ////////////////////////////////////// |