diff options
author | Oz Linden <oz@lindenlab.com> | 2013-06-19 09:44:23 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-06-19 09:44:23 -0400 |
commit | 2ca2b28dfdca94200d93dfa47952953481d20989 (patch) | |
tree | b4f5beb452ff52b22fec998151827771aaad7275 /indra/newview/pipeline.cpp | |
parent | 761bf254a4e72ec521ff1a52ac12f8594a350818 (diff) | |
parent | 2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff) |
merge changes for 3.6.0-release
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rwxr-xr-x | indra/newview/pipeline.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 8942092221..ebf6be4e36 100755 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -1395,7 +1395,7 @@ void LLPipeline::createLUTBuffers() LLImageGL::setManualImage(LLTexUnit::getInternalType(LLTexUnit::TT_TEXTURE), 0, GL_R16F, lightResX, lightResY, GL_RED, GL_FLOAT, ls, false); //LLImageGL::setManualImage(LLTexUnit::getInternalType(LLTexUnit::TT_TEXTURE), 0, GL_UNSIGNED_BYTE, lightResX, lightResY, GL_RED, GL_UNSIGNED_BYTE, ls, false); gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_CLAMP); - gGL.getTexUnit(0)->setTextureFilteringOption(LLTexUnit::TFO_POINT); + gGL.getTexUnit(0)->setTextureFilteringOption(LLTexUnit::TFO_TRILINEAR); delete [] ls; } |