diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-09-14 16:57:42 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-09-14 16:57:42 -0500 |
| commit | 4e006b0e3891d5728a6753059f2c5afc77737482 (patch) | |
| tree | 96af37ac252d823f8dc51e20546848ad464e0274 /indra/newview/llfloateranimpreview.cpp | |
| parent | 758b936deaa0e6ea397c49afa5024315415eeb93 (diff) | |
| parent | c0ca2c62fd6b9a90542907ce46bf1fe0ab379e13 (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); |