diff options
| author | simon <none@none> | 2014-11-24 11:26:36 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-11-24 11:26:36 -0800 |
| commit | 47423ad1a0d349f263ab1c2f0ceca299e418bbbc (patch) | |
| tree | 1c0452d8591ce67a6e33aad776594b6bc7b4570b /indra/llrender/llshadermgr.cpp | |
| parent | fa7610fea599a98cc6e79d3835a14f8e5ca2b6b1 (diff) | |
| parent | fa9097b65f9d89fd0c8bf7b32924f0327a617cdc (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 ////////////////////////////////////// |