diff options
| author | davep <none@none> | 2014-09-22 14:04:56 -0500 |
|---|---|---|
| committer | davep <none@none> | 2014-09-22 14:04:56 -0500 |
| commit | c591146b482e9c155edfd9ad58194413da45451b (patch) | |
| tree | 2a4e4363926a8de574cfcbe3fa59af749fe5c2a4 /indra/llrender/llshadermgr.cpp | |
| parent | 499f5aa9a4b46d61ee94b26d5c86bc032766af70 (diff) | |
| parent | 4caa2746f3b1d336947dcc9e277af8b8c08b44e0 (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 ////////////////////////////////////// |