summaryrefslogtreecommitdiff
path: root/indra/newview/llfloateranimpreview.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-08-11 14:19:58 -0500
committerDave Parks <davep@lindenlab.com>2011-08-11 14:19:58 -0500
commit2dd8ce53e4e0d14f2bc20796eb6bdf1ef12a65df (patch)
tree6adee912e10da8b54754edaaac7ed1d3f7a691d0 /indra/newview/llfloateranimpreview.cpp
parent364f8771ed6b7a4fabaf2ec1e547aafb8227c876 (diff)
SH-2242 FXAA support instead of unreliable multisample textures (done here because it's a smaller change than integrating glVertexAttrib with FSAA pipe). Shader integration with LLDynamicTexture subclasses.
Diffstat (limited to 'indra/newview/llfloateranimpreview.cpp')
-rw-r--r--indra/newview/llfloateranimpreview.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llfloateranimpreview.cpp b/indra/newview/llfloateranimpreview.cpp
index 1f334815d6..ef92dfd956 100644
--- a/indra/newview/llfloateranimpreview.cpp
+++ b/indra/newview/llfloateranimpreview.cpp
@@ -1072,6 +1072,11 @@ BOOL LLPreviewAnimation::render()
gGL.pushMatrix();
glLoadIdentity();
+ if (LLGLSLShader::sNoFixedFunction)
+ {
+ gUIProgram.bind();
+ }
+
LLGLSUIDefault def;
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
gGL.color4f(0.15f, 0.2f, 0.3f, 1.f);