diff options
| author | simon <none@none> | 2014-11-24 11:31:06 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-11-24 11:31:06 -0800 |
| commit | fa068dffd023f35d161753009e6079edfe2ad012 (patch) | |
| tree | 1c44c558e8a3dd21de6767eb911b6955579a266b /indra/llrender/llshadermgr.cpp | |
| parent | 8cb6fe2695fae0ae37a042ff052c613702970ddd (diff) | |
| parent | 47423ad1a0d349f263ab1c2f0ceca299e418bbbc (diff) | |
Merge downstream code 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 ////////////////////////////////////// |