diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2019-07-15 23:23:48 +0000 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2019-07-15 23:23:48 +0000 |
| commit | e96356ce60a77401c531cb36f0e51eaa5fa72cd0 (patch) | |
| tree | 602ea73b6df01487765afeaced008d8c64f60594 /indra/newview/lldynamictexture.cpp | |
| parent | 01bdbdb6acb4e315cb7de811d6ecced41fa0f9a7 (diff) | |
| parent | f6eab050178336a553f52837b8e8a4cc0bf6bacb (diff) | |
Merged in graham_linden/viewer-eep-g (pull request #462)
SL-10761, SL-11590, SL-10625
Diffstat (limited to 'indra/newview/lldynamictexture.cpp')
| -rw-r--r-- | indra/newview/lldynamictexture.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp index 5e283f7cd0..e1f41a9bd7 100644 --- a/indra/newview/lldynamictexture.cpp +++ b/indra/newview/lldynamictexture.cpp @@ -240,6 +240,7 @@ BOOL LLViewerDynamicTexture::updateAllInstances() gDepthDirty = TRUE; gGL.color4f(1,1,1,1); + dynamicTexture->setBoundTarget(use_fbo ? &gPipeline.mWaterDis : nullptr); dynamicTexture->preRender(); // Must be called outside of startRender() result = FALSE; if (dynamicTexture->render()) @@ -250,7 +251,7 @@ BOOL LLViewerDynamicTexture::updateAllInstances() } //gGL.flush(); LLVertexBuffer::unbind(); - + dynamicTexture->setBoundTarget(nullptr); dynamicTexture->postRender(result); } } |