diff options
| author | simon <none@none> | 2014-11-10 14:49:21 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-11-10 14:49:21 -0800 |
| commit | 6796e6c3fcd0dde3d39a7c7b4df785e28b9c7fcd (patch) | |
| tree | da55b029c05b45e503f2fbd25f079bb6dbfb4698 /indra/llrender/llshadermgr.cpp | |
| parent | dbbf9ccd32f8655e3873bee0db14be7ec91f619d (diff) | |
| parent | 2301cf800f40101baed7a5936683d0b1e4968be1 (diff) | |
Merge viewer-release and become version 3.7.21
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 ////////////////////////////////////// |