diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-03-09 12:56:04 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-03-09 12:56:04 -0500 |
| commit | 11c6654479a299549dc0035faa894678a60e157e (patch) | |
| tree | 267ebd388c62f41b4b19e9eb3e777ba60e368dba /indra/llrender/llshadermgr.cpp | |
| parent | a7aa89e2cb98c28be7b20bcae6dc1cb47f4d56c1 (diff) | |
| parent | c6acd4723526ed82e79dccef18aaf4821e53dfeb (diff) | |
merge changes for vmrg-227
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")) |