diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-10-25 11:48:43 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-10-25 11:48:43 -0700 |
| commit | 970ee73e9a9cd1c94c295c9decb4d632886c19e6 (patch) | |
| tree | 18cc7f08bbc043252bea9a6f687807116585d286 /indra/newview/llface.cpp | |
| parent | d4e622daf2775147c75a75389ffb9b55f8cef799 (diff) | |
Fix release merge issues (included upstream changes not yet in release from bear)
Diffstat (limited to 'indra/newview/llface.cpp')
| -rwxr-xr-x | indra/newview/llface.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index dbbfceb532..369273bca6 100755 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1526,6 +1526,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, } glBindBufferARB(GL_TRANSFORM_FEEDBACK_BUFFER, 0); + gGL.popMatrix(); if (cur_shader) |