diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-09-13 16:11:22 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-09-13 16:11:22 -0500 |
| commit | c0ca2c62fd6b9a90542907ce46bf1fe0ab379e13 (patch) | |
| tree | 69bed5c3a72357e183384917b5495c2990e1ac13 /indra/newview/llfloateranimpreview.cpp | |
| parent | 19371a9abed3198f9f6083c3b2483e65778e944a (diff) | |
| parent | 38c19f4e55c0f6a104de87dfb57313a6c529b4d6 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloateranimpreview.cpp')
| -rw-r--r-- | indra/newview/llfloateranimpreview.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llfloateranimpreview.cpp b/indra/newview/llfloateranimpreview.cpp index 9f0218a95e..1318dfdf2a 100644 --- a/indra/newview/llfloateranimpreview.cpp +++ b/indra/newview/llfloateranimpreview.cpp @@ -1071,6 +1071,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); |