diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-03-06 09:36:23 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-03-06 09:36:23 +0800 |
| commit | d13a43c74f9c7e450f87edab0bcd9db39ee7c56e (patch) | |
| tree | d40e4e3c1f5ce0cf80b11b2d03568c48cfc5e88f /indra/newview/lldrawpoolwater.cpp | |
| parent | 5bf93b728ca7c671b6b812e753a40dcdb55b5d0d (diff) | |
| parent | aa060ae56c62869bb1d0f590e9a6eb681aabcefc (diff) | |
Merge remote-tracking branch 'secondlife/release/2025.03' into 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) |