diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-09-26 11:45:07 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-09-26 11:45:07 -0700 |
| commit | 037cbf82310710a1ec8f0affd2bba24aa87d20b5 (patch) | |
| tree | 51eb135eaaff94a8ed119486d05e963c2cd8a676 /indra/newview/llface.cpp | |
| parent | 0103cac1ddda96fd470238d2c8b73c2cf55b6c12 (diff) | |
| parent | e285d515d5b94acce280edf586a16272931749d9 (diff) | |
Merge lion for good measure
Diffstat (limited to 'indra/newview/llface.cpp')
| -rwxr-xr-x | indra/newview/llface.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 369273bca6..dbbfceb532 100755 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1526,7 +1526,6 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, } glBindBufferARB(GL_TRANSFORM_FEEDBACK_BUFFER, 0); - gGL.popMatrix(); if (cur_shader) |