diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2022-08-31 10:16:24 -0700 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2022-08-31 10:16:24 -0700 |
| commit | 71115a7a2727301dbf8ba62a082cc9fa1d310a8d (patch) | |
| tree | 1fff229e1dd5365945bd850ab1e84c8ca693846d /indra/newview/llviewertexturelist.cpp | |
| parent | 5c0e201cd61cf7b29b8871864c8fc7f90c82b5cd (diff) | |
| parent | 8eaee1f033d9dac892e749cc65416e149021d8f6 (diff) | |
SL-17703: Fix merge
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
| -rw-r--r-- | indra/newview/llviewertexturelist.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index f2d0f837ba..9cbbf1c276 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -120,7 +120,10 @@ void LLViewerTextureList::doPreloadImages() // Set the default flat normal map LLViewerFetchedTexture::sFlatNormalImagep = LLViewerTextureManager::getFetchedTextureFromFile("flatnormal.tga", FTT_LOCAL_FILE, MIPMAP_NO, LLViewerFetchedTexture::BOOST_BUMP); - + + // PBR: irradiance + LLViewerFetchedTexture::sDefaultIrradiancePBRp = LLViewerTextureManager::getFetchedTextureFromFile("default_irradiance.png", FTT_LOCAL_FILE, MIPMAP_YES, LLViewerFetchedTexture::BOOST_UI); + image_list->initFromFile(); // turn off clamping and bilinear filtering for uv picking images |