diff options
| author | Dave Parks <davep@lindenlab.com> | 2014-06-19 13:14:42 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2014-06-19 13:14:42 -0500 |
| commit | d0428575fb9c3d285dc32e61808a877cb24efa89 (patch) | |
| tree | 79e7ad754a5e449b66979f71146f4e8537cf69fb /indra/llrender/llshadermgr.cpp | |
| parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) | |
| parent | e43f43b4d9dbcaeb20884772b3fcba6df5e9a62c (diff) | |
Automated merge with http://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 ////////////////////////////////////// |