diff options
| author | davep <none@none> | 2014-09-19 11:58:16 -0500 |
|---|---|---|
| committer | davep <none@none> | 2014-09-19 11:58:16 -0500 |
| commit | 8682750eab88ac54030f04239ea2b4d497ad9567 (patch) | |
| tree | 96cb4d0b8da8f0998e4dd7ddde3bba688c4feaf7 /indra/llrender/llshadermgr.cpp | |
| parent | eef4acc5367a486b0c52c6ce5e1aba995fefd99c (diff) | |
| parent | 749d1665643b33d6c5b7b97e43f4eae996fbf465 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-release
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 ////////////////////////////////////// |