diff options
author | RunitaiLinden <davep@lindenlab.com> | 2024-02-08 14:54:57 -0600 |
---|---|---|
committer | RunitaiLinden <davep@lindenlab.com> | 2024-02-08 14:54:57 -0600 |
commit | 602be267ed55dc7cb3725bff1510d59bec950d39 (patch) | |
tree | 695e72c4794bed40a2b32fdd65bda14901439d5c /indra/newview/llviewershadermgr.cpp | |
parent | c721152c444ee7a13e4217f86dfcce34b7488ee5 (diff) | |
parent | 4f6e3acece507b8be66b76db5609bdaec41307d4 (diff) |
Merge branch 'release/materials_featurette' into materials_featurette/mirrors
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
-rw-r--r-- | indra/newview/llviewershadermgr.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index e6cf37bc3c..b175172b9b 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -680,6 +680,7 @@ std::string LLViewerShaderMgr::loadBasicShaders() const F32 triplanar_factor = gSavedSettings.getF32("RenderTerrainPBRTriplanarBlendFactor"); attribs["TERRAIN_TRIPLANAR_BLEND_FACTOR"] = llformat("%.2f", triplanar_factor); S32 detail = gSavedSettings.getS32("RenderTerrainPBRDetail"); + detail = llclamp(detail, TERRAIN_PBR_DETAIL_MIN, TERRAIN_PBR_DETAIL_MAX); attribs["TERRAIN_PBR_DETAIL"] = llformat("%d", detail); } |