diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-01 23:32:30 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-01 23:32:30 +0100 |
| commit | 8cfdc07e790a557e881fadaa1b6258e5b16751f4 (patch) | |
| tree | a792d0e6f03886f4a3d8f064811fdcbbf2ce1a61 /indra/llrender/llshadermgr.cpp | |
| parent | 8dd85013865cc5b426234cd71b605d7208bcfe01 (diff) | |
Code cleanup and move to using typedefs of S64Seconds/F64Seconds for ease in sync w/ sim side which has not llunits types.
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 544a4f00aa..1eb1cb56a8 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -985,7 +985,7 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade // Add shader file to map mShaderObjects[filename] = ret; shader_level = try_gpu_class; - } + } else { if (shader_level > 1) @@ -1150,7 +1150,7 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("cloud_noise_texture"); mReservedUniforms.push_back("fullbright"); mReservedUniforms.push_back("lightnorm"); - mReservedUniforms.push_back("sunlight_color"); + mReservedUniforms.push_back("sunlight_color_copy"); mReservedUniforms.push_back("ambient"); mReservedUniforms.push_back("blue_horizon"); mReservedUniforms.push_back("blue_density"); |