diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-06-17 16:02:57 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-06-17 16:02:57 -0700 |
| commit | d0dfffe659b24f5a6bfadc5cc612869e1f08bb93 (patch) | |
| tree | 8df3c672aba2f1aca8e9861bcf7626bd8116b107 /indra/newview/lldrawpoolterrain.cpp | |
| parent | 5e60392c273f0c9c5efa765a05414c618381780a (diff) | |
| parent | 375555012f92c1b836f2d122754f9facd050be62 (diff) | |
Merge remote-tracking branch 'origin/develop' into brad/webrtc-voice-develop
Diffstat (limited to 'indra/newview/lldrawpoolterrain.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolterrain.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolterrain.cpp b/indra/newview/lldrawpoolterrain.cpp index 2897f3d749..afc5cc9d4e 100644 --- a/indra/newview/lldrawpoolterrain.cpp +++ b/indra/newview/lldrawpoolterrain.cpp @@ -202,7 +202,7 @@ void LLDrawPoolTerrain::drawLoop() void LLDrawPoolTerrain::renderFullShader() { - const bool use_local_materials = gLocalTerrainMaterials.materialsReady(true, false); + const bool use_local_materials = gLocalTerrainMaterials.makeMaterialsReady(true, false); // Hack! Get the region that this draw pool is rendering from! LLViewerRegion *regionp = mDrawFace[0]->getDrawable()->getVObj()->getRegion(); LLVLComposition *compp = regionp->getComposition(); |