diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-10-14 17:25:24 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-10-14 17:25:24 -0700 |
| commit | f6c7b906e1f1d1bcc56a1e71b1867a58c5b2381a (patch) | |
| tree | ec9226508d7a3e1555b774fde915a8b299b35cd7 /indra/newview/llface.cpp | |
| parent | c2f5365f986aab49d5c7cfa2834a68f5b35c09c2 (diff) | |
| parent | 04b84ce07dd5bc8364f948ef0004e3dc5328f1b4 (diff) | |
Pull merge with lindenlab/viewer-bear
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) |