diff options
| author | ruslantproductengine <ruslantproductengine@lindenlab.com> | 2017-11-09 17:42:26 +0200 |
|---|---|---|
| committer | ruslantproductengine <ruslantproductengine@lindenlab.com> | 2017-11-09 17:42:26 +0200 |
| commit | 77091b8080ed48f0f4116dd04cfe6d3bf1c9fa29 (patch) | |
| tree | 9940f94eeebf1a0093fbf7a9c34a2e6cee13b4f6 /indra/newview/pipeline.cpp | |
| parent | a700c2a2e97eaa934b6ba570c6885243918cc1ab (diff) | |
MAINT-47 [PUBLIC]WindLight: Special overlays (including property lines and hilights for beacons) aren't visible in shader water
FIXED
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index e8338f3e8c..55c0a092bf 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -9988,7 +9988,19 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in) } else { - renderGeom(camera); + renderGeom(camera); + + if (LLGLSLShader::sNoFixedFunction) + { + gUIProgram.bind(); + } + + LLWorld::getInstance()->renderPropertyLines(); + + if (LLGLSLShader::sNoFixedFunction) + { + gUIProgram.unbind(); + } } if (LLPipeline::sRenderDeferred && materials_in_water) |