diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-05-31 09:33:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-31 09:33:42 -0400 |
| commit | c88f5d26dc894f8d82b948c387a9a3b70862731b (patch) | |
| tree | fd96237f2a595396cd4a2861f976483ea8ef1544 /indra/newview/llterrainpaintmap.cpp | |
| parent | aeefc73129978f6f2c1ba8caaff2750eff2cfbb3 (diff) | |
| parent | 39625d10b8a50ed4ca91d618d6ad638b99087e35 (diff) | |
Merge pull request #4176 from secondlife/geenz/2025.04-to-develop
Merge 2025.04 into develop
Diffstat (limited to 'indra/newview/llterrainpaintmap.cpp')
| -rw-r--r-- | indra/newview/llterrainpaintmap.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llterrainpaintmap.cpp b/indra/newview/llterrainpaintmap.cpp index 8ccde74c93..c7a82013e4 100644 --- a/indra/newview/llterrainpaintmap.cpp +++ b/indra/newview/llterrainpaintmap.cpp @@ -204,8 +204,9 @@ bool LLTerrainPaintMap::bakeHeightNoiseIntoPBRPaintMapRGB(const LLViewerRegion& { LLVector3 scratch3; LLVector3 pos3; + LLVector2 tex0_temp; LLVector2 tex1_temp; - patch->eval(i, j, stride, &pos3, &scratch3, &tex1_temp); + patch->eval(i, j, stride, &pos3, &scratch3, &tex0_temp, &tex1_temp); (*pos++).set(pos3.mV[VX], pos3.mV[VY], pos3.mV[VZ]); *tex1++ = tex1_temp; vertex_total++; |