livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #750 from secondlife/vi-67 

secondlife/viewer#67: (debug) Add temporary setting to force-load PBR terrain
meow-7.2.2
cosmic-linden 2024-02-07 09:12:15 -08:00 committed by GitHub
parent 7a5b0f5acf c583c666d2
commit f0570e4edb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@ -10844,6 +10844,17 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>RenderTerrainPBRForce</key>
<map>
<key>Comment</key>
<string>Force-load PBR terrain if enabled</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RenderTerrainPBRDetail</key>
<map>
<key>Comment</key>

21
indra/newview/llvlcomposition.cpp
View File

@ -142,6 +142,27 @@ BOOL LLTerrainMaterials::texturesReady(BOOL boost)
BOOL LLTerrainMaterials::materialsReady(BOOL boost)
{
#if 1
static bool sRenderTerrainPBREnabled = gSavedSettings.get<bool>("RenderTerrainPBREnabled");
static LLCachedControl<bool> sRenderTerrainPBRForce(gSavedSettings, "RenderTerrainPBRForce", false);
if (sRenderTerrainPBREnabled && sRenderTerrainPBRForce)
{
bool defined = true;
for (S32 i = 0; i < ASSET_COUNT; i++)
{
if (!mDetailMaterials[i])
{
defined = false;
break;
}
}
if (defined)
{
return TRUE;
}
}
#endif
BOOL ready = TRUE;
for (S32 i = 0; i < ASSET_COUNT; i++)
{