diff options
| author | simon <none@none> | 2014-04-21 12:48:50 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-04-21 12:48:50 -0700 |
| commit | a5a0a0b1362da5d00cc6d09bb841ef6167bb2922 (patch) | |
| tree | 0b58bf76487dca0bc439d1f99cd568f970b9cc32 /indra/newview/pipeline.cpp | |
| parent | 114084bb80d4991519e2ca4020823319810c64b2 (diff) | |
| parent | 0b9a777bfd3c85390c55d91fc3dc5c4bee9bf71b (diff) | |
Merge downstream code
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rwxr-xr-x | indra/newview/pipeline.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 725fe1ffdd..ab6e5cc353 100755 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -4411,11 +4411,9 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate) sUnderWaterRender = FALSE; } - if (LLViewerFetchedTexture::sDefaultImagep) - { - gGL.getTexUnit(0)->bind(LLViewerFetchedTexture::sDefaultImagep); - LLViewerFetchedTexture::sDefaultImagep->setAddressMode(LLTexUnit::TAM_WRAP); - } + gGL.getTexUnit(0)->bind(LLViewerFetchedTexture::sDefaultImagep); + LLViewerFetchedTexture::sDefaultImagep->setAddressMode(LLTexUnit::TAM_WRAP); + ////////////////////////////////////////////// // |