diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-02-25 09:45:04 -0500 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-02-25 09:45:04 -0500 |
| commit | 42e219fb0433e92b51dfbc8daad06044f41fa4c4 (patch) | |
| tree | 3eb0003a77226320cc2394b3db3ebabb981c5609 /indra/newview/lldrawpoolwater.cpp | |
| parent | 1754aea5ff8f8a78f5a25e6652692eee7df4ff23 (diff) | |
| parent | ca079bc14911ddca631167e078deab6d35224f23 (diff) | |
Merge branch 'release/2024.12-ForeverFPS' into release/2025.03
Diffstat (limited to 'indra/newview/lldrawpoolwater.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolwater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp index 32de0e5ee7..7d58511d41 100644 --- a/indra/newview/lldrawpoolwater.cpp +++ b/indra/newview/lldrawpoolwater.cpp @@ -213,7 +213,7 @@ void LLDrawPoolWater::renderPostDeferred(S32 pass) else if (tex_b && !tex_a) { shader->bindTexture(LLViewerShaderMgr::BUMP_MAP, tex_b); - tex_a->setFilteringOption(filter_mode); + tex_b->setFilteringOption(filter_mode); blend_factor = 0; // only one tex provided, no blending } else if (tex_b != tex_a) |