diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-10-13 15:26:50 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-10-13 15:26:50 -0400 |
| commit | 5341e1d389068f6f8b3d4b47a12270a95e154176 (patch) | |
| tree | 1de7a5551953172b1bb87cf1931890e6fdde91b2 /indra/llrender/llshadermgr.cpp | |
| parent | 788ce7a8cdbbbf98566ce75ec281ec00c21dc6d8 (diff) | |
| parent | c591146b482e9c155edfd9ad58194413da45451b (diff) | |
merge up to 3.7.18
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 ////////////////////////////////////// |