diff options
| author | Northspring <pantera.polnocy@phoenixviewer.com> | 2014-11-15 21:13:50 +0100 |
|---|---|---|
| committer | Northspring <pantera.polnocy@phoenixviewer.com> | 2014-11-15 21:13:50 +0100 |
| commit | dc913aaea58ef7ce71e27dd7e49da0b10622b05e (patch) | |
| tree | c9ef9a503ff9c9732c4ea5a8df1a909c73af1880 /indra/llrender/llshadermgr.cpp | |
| parent | c721f87d83a0402a62a1694a1c682053ec0f09a7 (diff) | |
| parent | 2301cf800f40101baed7a5936683d0b1e4968be1 (diff) | |
Merge
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 ////////////////////////////////////// |