summaryrefslogtreecommitdiff
path: root/indra/newview/llvlcomposition.cpp
diff options
context:
space:
mode:
authorCosmic Linden <cosmic@lindenlab.com>2024-07-11 15:54:24 -0700
committerCosmic Linden <cosmic@lindenlab.com>2024-08-06 16:28:47 -0700
commit6aa9110b2ae346da1a396500cae1b41e8e2d5b75 (patch)
tree93c83eb1a2c515feef3e00c349f33e16e06d56d2 /indra/newview/llvlcomposition.cpp
parentae2ff22542a5882616778ffab50612f8ad41b71e (diff)
secondlife/viewer#1883: Local-only PBR terrain paintmap with developer tools
Diffstat (limited to 'indra/newview/llvlcomposition.cpp')
-rw-r--r--indra/newview/llvlcomposition.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llvlcomposition.cpp b/indra/newview/llvlcomposition.cpp
index f5f058a080..077e6e6cb1 100644
--- a/indra/newview/llvlcomposition.cpp
+++ b/indra/newview/llvlcomposition.cpp
@@ -312,6 +312,17 @@ bool LLTerrainMaterials::makeMaterialsReady(bool boost, bool strict)
return one_ready;
}
+LLViewerTexture* LLTerrainMaterials::getPaintMap()
+{
+ return mPaintMap.get();
+}
+
+void LLTerrainMaterials::setPaintMap(LLViewerTexture* paint_map)
+{
+ llassert(!paint_map || mPaintType == TERRAIN_PAINT_TYPE_PBR_PAINTMAP);
+ mPaintMap = paint_map;
+}
+
// Boost the texture loading priority
// Return true when ready to use (i.e. texture is sufficiently loaded)
// static