diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-08-10 14:50:11 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-08-10 14:50:11 -0500 |
| commit | 265db1f17c74c8e21a532e2e85a623383ef84728 (patch) | |
| tree | 98d3771410e4b96af9009dd6566d1481d07e8bd2 /indra/newview/lldynamictexture.cpp | |
| parent | 17f46868d28876b65adcf24a45e6c19a20f2834c (diff) | |
| parent | db92b0369194f1a81b92fd3fa72458eb0c1d2f20 (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 f781d5f3ff..4955b6224e 100644 --- a/indra/newview/lldynamictexture.cpp +++ b/indra/newview/lldynamictexture.cpp @@ -40,6 +40,7 @@ #include "llvertexbuffer.h" #include "llviewerdisplay.h" #include "llrender.h" +#include "llglslshader.h" // static LLViewerDynamicTexture::instance_list_t LLViewerDynamicTexture::sInstances[ LLViewerDynamicTexture::ORDER_COUNT ]; @@ -206,6 +207,9 @@ BOOL LLViewerDynamicTexture::updateAllInstances() return TRUE; } + LLGLSLShader::bindNoShader(); + LLVertexBuffer::unbind(); + BOOL result = FALSE; BOOL ret = FALSE ; for( S32 order = 0; order < ORDER_COUNT; order++ ) |