diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-11-10 14:57:55 -0500 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-11-10 14:57:55 -0500 |
| commit | f135fd6f14eabfc08710b5099d1be7aa7a952873 (patch) | |
| tree | 04d2e50314c29e7c5c1420c0e960e5b2f4f9ecfd /indra/llrender/llshadermgr.cpp | |
| parent | de9689e39beaea51db07b9ec60ddb106493b5c28 (diff) | |
| parent | 2301cf800f40101baed7a5936683d0b1e4968be1 (diff) | |
Merge. Refresh from viewer-release after 3.7.20 released.
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 ////////////////////////////////////// |