diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-27 00:14:56 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-27 00:14:56 +0200 |
commit | 78174fc8658caeddfd8306ec19eb0e1c2975368e (patch) | |
tree | 0948d578f384fbd247eefd2dff771a9cd8cbd8c1 /indra/newview/pipeline.cpp | |
parent | 689ef9442581d7af8ff0e0264be4919fe6cffd73 (diff) | |
parent | 9567393f803dfb0c786b8e917e41c8f4b8b22af7 (diff) |
Merge remote-tracking branch 'origin/main' into DRTVWR-588-maint-W
# Conflicts:
# .github/workflows/build.yaml
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r-- | indra/newview/pipeline.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 8bdf9bbb8c..f5f2ba52bf 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -8365,7 +8365,7 @@ void LLPipeline::doWaterHaze() else { //render water patches like LLDrawPoolWater does - LLGLDepthTest depth(GL_FALSE); + LLGLDepthTest depth(GL_TRUE, GL_FALSE); LLGLDisable cull(GL_CULL_FACE); gGLLastMatrix = NULL; |