diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-11-14 22:32:54 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-11-14 22:32:54 -0500 |
| commit | 6b4916fc758ba1ab70cced59b8fb959e241b984a (patch) | |
| tree | 9b72b24291554abe87456776ebaaa56e6c3f8ad7 /indra/llrender/llshadermgr.cpp | |
| parent | dbdbcbbd3cc3ba21b255f992fae291ab3f13edcf (diff) | |
| parent | cfb1779e26d1ab15acdbc9d2fc5982b84af56765 (diff) | |
merge up to tip of viewer-tools-update
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 ////////////////////////////////////// |