summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexturelist.cpp
diff options
context:
space:
mode:
authorPtolemy <ptolemy@lindenlab.com>2022-08-30 20:35:15 -0700
committerPtolemy <ptolemy@lindenlab.com>2022-08-30 20:35:15 -0700
commit8eaee1f033d9dac892e749cc65416e149021d8f6 (patch)
tree2f7b9b72f1aae737407f7da8ebc01ae2b09c2abf /indra/newview/llviewertexturelist.cpp
parent197ac7cc2048fe4c259858f48946cd954782dfc2 (diff)
SL-17703: PBR: Fix albedo being in wrong color space, add support for debug default_irradiance.png
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
-rw-r--r--indra/newview/llviewertexturelist.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index 1a766dd404..3d99e62e22 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