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 | 6aab85e6e47228f425cf1034ad53946de42a0256 (patch) | |
| tree | 30d4082fae73bac5a5c5b342b66543ab540cab8b /indra/newview/pipeline.cpp | |
| parent | 99308bb8a828c991be06c8620f02d6618328be15 (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 5a8e6ced6c..e541c1054e 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -9995,7 +9995,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) |