diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-11-11 15:50:01 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-11-11 15:50:01 -0800 |
| commit | 10705b43600d31b31d903ed1d4e3aba0bd4e2963 (patch) | |
| tree | df43426032ec82dc34f9019a063a4cdfa00be1da /indra/newview/llface.cpp | |
| parent | 66b6bffca92261d418f9888be4c3542554ddb4af (diff) | |
| parent | ebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 (diff) | |
Merge 3.6.11 for RC-ability
Diffstat (limited to 'indra/newview/llface.cpp')
| -rwxr-xr-x | indra/newview/llface.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 369273bca6..ae62be0ad0 100755 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1386,7 +1386,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, } } - static LLCachedControl<bool> use_transform_feedback(gSavedSettings, "RenderUseTransformFeedback"); + static LLCachedControl<bool> use_transform_feedback(gSavedSettings, "RenderUseTransformFeedback", false); #ifdef GL_TRANSFORM_FEEDBACK_BUFFER if (use_transform_feedback && @@ -1526,7 +1526,6 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, } glBindBufferARB(GL_TRANSFORM_FEEDBACK_BUFFER, 0); - gGL.popMatrix(); if (cur_shader) |