diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-11-10 15:12:12 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-11-10 15:12:12 -0500 |
| commit | c977268ff53ea362bc3b089945c9aa9a438cb63f (patch) | |
| tree | 32d8283251ac618d64638042bf5f9d3acff19d43 /indra/llrender/llshadermgr.cpp | |
| parent | 90e862c7cecfc10e9abd16933cead58e34f07fb4 (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 ////////////////////////////////////// |