diff options
| author | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2014-11-11 03:50:38 +0200 |
|---|---|---|
| committer | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2014-11-11 03:50:38 +0200 |
| commit | 7894a0bb9a72f1e910157d4ac50047b7e894d5e2 (patch) | |
| tree | 23fdbd8be092d8d347afdd0f40bad561ef8baaf2 /indra/llrender/llshadermgr.cpp | |
| parent | f9d82b83a894418090fdf4268401c73fb632f2ef (diff) | |
| parent | 2301cf800f40101baed7a5936683d0b1e4968be1 (diff) | |
merge changes with 3.7.20-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 ////////////////////////////////////// |