diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-28 22:53:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-28 22:53:24 +0200 |
| commit | 9c0a6d1b0e5e9d6da6a63ff367f40ab08c064bbe (patch) | |
| tree | 70ee7701d7a24a0759915f8050786ed43a8a2a7a /indra/newview/llvlcomposition.cpp | |
| parent | 0ef7a9b39cf72da1211039ab22bdf8f9f6a2c984 (diff) | |
| parent | b2f1e8899b32f681e13705d684db9a93d18450ae (diff) | |
Merge pull request #2966 from secondlife/marchcat/c-develop
develop → Maint C sync
Diffstat (limited to 'indra/newview/llvlcomposition.cpp')
| -rw-r--r-- | indra/newview/llvlcomposition.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llvlcomposition.cpp b/indra/newview/llvlcomposition.cpp index 077e6e6cb1..ca76d93cd7 100644 --- a/indra/newview/llvlcomposition.cpp +++ b/indra/newview/llvlcomposition.cpp @@ -320,7 +320,11 @@ LLViewerTexture* LLTerrainMaterials::getPaintMap() void LLTerrainMaterials::setPaintMap(LLViewerTexture* paint_map) { llassert(!paint_map || mPaintType == TERRAIN_PAINT_TYPE_PBR_PAINTMAP); + const bool changed = paint_map != mPaintMap; mPaintMap = paint_map; + // The paint map has changed, so edits are no longer valid + mPaintRequestQueue.clear(); + mPaintMapQueue.clear(); } // Boost the texture loading priority |