diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2024-08-13 10:34:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-13 10:34:35 -0700 |
| commit | d696010cea1dd0abf6821d6756bc1f33a955cb3f (patch) | |
| tree | 43e1ed90604e83704c0140bce6836dc427f56190 /indra/newview/llvlcomposition.cpp | |
| parent | 50e05c70d38c0e9da654cbc0f1758809e7159744 (diff) | |
| parent | f1fac8127fb7ea7107c2f5af39b9933523fbadca (diff) | |
Merge pull request #2210 from secondlife/v-1883
secondlife/viewer#1883: Local-only PBR terrain paintmap with developer tools
Diffstat (limited to 'indra/newview/llvlcomposition.cpp')
| -rw-r--r-- | indra/newview/llvlcomposition.cpp | 11 |
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 |