diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-03-13 14:50:20 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-03-13 14:50:20 -0700 |
| commit | 629ec1d54d16549d42198a9ac83a33bb9b51ab22 (patch) | |
| tree | 2c1d558742f0d46c2277883de4de094dcabcb7f3 /indra/llrender/llshadermgr.cpp | |
| parent | 9aa0c58c20f8d60dc2f674ce1eaa805db8f599c8 (diff) | |
| parent | 1c812c3c6734197835fd8cfaef286f1ad444ec64 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 1a03aeebb7..908443e8cf 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -94,13 +94,16 @@ BOOL LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader) } } - if (features->calculatesLighting) + if (features->calculatesLighting || features->atmosphericHelpers) { if (!shader->attachObject("windlight/atmosphericsHelpersV.glsl")) { return FALSE; } + } + if (features->calculatesLighting) + { if (features->isSpecular) { if (!shader->attachObject("lighting/lightFuncSpecularV.glsl")) |