diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-05 19:18:58 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-05 19:18:58 -0500 |
| commit | 1f4bc180502d1a4448e18715596a61ae9f406c4f (patch) | |
| tree | 009f70b9f3d27ce28571d0f056a169497bb74b9f /indra/newview/lldynamictexture.cpp | |
| parent | 194bedbb96a6dcfe90d5b731aeca8658c83f2306 (diff) | |
| parent | 2b51a7a60942b1efc99cee43489ef2f92fa7a188 (diff) | |
merge
Diffstat (limited to 'indra/newview/lldynamictexture.cpp')
| -rw-r--r-- | indra/newview/lldynamictexture.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp index fb9958ee9d..5d6081a35c 100644 --- a/indra/newview/lldynamictexture.cpp +++ b/indra/newview/lldynamictexture.cpp @@ -41,6 +41,7 @@ #include "llviewerdisplay.h" #include "llrender.h" #include "pipeline.h" +#include "llglslshader.h" // static LLViewerDynamicTexture::instance_list_t LLViewerDynamicTexture::sInstances[ LLViewerDynamicTexture::ORDER_COUNT ]; @@ -207,6 +208,9 @@ BOOL LLViewerDynamicTexture::updateAllInstances() return TRUE; } + LLGLSLShader::bindNoShader(); + LLVertexBuffer::unbind(); + BOOL result = FALSE; BOOL ret = FALSE ; for( S32 order = 0; order < ORDER_COUNT; order++ ) |