diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-08-16 08:52:26 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-08-16 08:52:26 -0400 |
| commit | a7d8b425097a7fab0a5a40d6a6b5770deb0bb7f9 (patch) | |
| tree | 81e800d495674faa37d66c18db36cbfccd7fc5eb /indra/newview/llmaniptranslate.cpp | |
| parent | df93749819c503a66bc0ad34aeb1c7bed3746df2 (diff) | |
| parent | b9e43dfd646990be236e44814ce3199de3391dc1 (diff) | |
merge up to latest viewer-development
Diffstat (limited to 'indra/newview/llmaniptranslate.cpp')
| -rw-r--r-- | indra/newview/llmaniptranslate.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp index 10608463b4..362308c176 100644 --- a/indra/newview/llmaniptranslate.cpp +++ b/indra/newview/llmaniptranslate.cpp @@ -1755,6 +1755,11 @@ void LLManipTranslate::highlightIntersection(LLVector3 normal, shader->bind(); } + if (shader) + { + shader->bind(); + } + //draw volume/plane intersections { gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); |