diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-12-05 09:36:41 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-12-05 09:36:41 -0800 |
| commit | 837e4e5165cc3e6595577e90bae240e676be8ffe (patch) | |
| tree | 85c8e8a8cb6adf8abc87fe3a70d4513a1ab625e5 /indra/newview/lldynamictexture.cpp | |
| parent | 570d02dc7e41c3e08477e7f759d632db78690eb4 (diff) | |
| parent | 71974461114d81f818f69a4344ce4071c20f331f (diff) | |
Merge with viewer-experience
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++ ) |