diff options
author | Dave Parks <davep@lindenlab.com> | 2011-08-21 16:23:50 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-08-21 16:23:50 -0500 |
commit | 90ebaeef9b629cb63e7a94a526478f2e340ff439 (patch) | |
tree | 14f61c7fc6c2c41cace22a9582075d54ad8181bc /indra/newview/lldynamictexture.cpp | |
parent | 63c420d8ddb7cc738877d2771b1c3b8972a4de09 (diff) | |
parent | ee4fdd2c18c722164d78a7305777fad6e49cba8b (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++ ) |