diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-08-19 16:34:34 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-08-19 16:34:34 -0500 |
| commit | 233e42b3314c17b2e24334587d960af6e3dc963c (patch) | |
| tree | 480e571bf913bb0743c3c6c6ce846a69aa405504 /indra/newview/llfloateranimpreview.cpp | |
| parent | 0e496309d6cb7581c9f69b7da244699c382750ac (diff) | |
| parent | 80398b3ccb0c4a6ff3ac20b3565619fe5cecc2f9 (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 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); |