diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-11-24 06:56:57 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-11-24 06:56:57 -0500 |
| commit | b69be18d7b41b639d3c62354ca7ab6e3bc32f1cb (patch) | |
| tree | 355347be68e29f59ad5299abd9b42423359eb60e /indra/newview/lldynamictexture.cpp | |
| parent | fb605a047aa1c6b293b9546a06ac800c53d109ba (diff) | |
| parent | 8c86a08e72708e96dcf67830518187a00478bbfd (diff) | |
merge changes for vmrg-193
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++ ) |