diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-11-26 11:40:32 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-11-26 11:40:32 -0500 |
| commit | e345cfbe55f8a530432780b03ff78b4edae6e036 (patch) | |
| tree | 7b1f14c30834f14cc1bff9e3f9da101f39135b33 /indra/llrender/llshadermgr.cpp | |
| parent | c7c549b7e24af3b9ee87d464a03adeab75ee6553 (diff) | |
| parent | 2301cf800f40101baed7a5936683d0b1e4968be1 (diff) | |
merge
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 ////////////////////////////////////// |