diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-09 12:35:32 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-09 12:35:32 +0100 |
| commit | 7539836bc960f9435d7712f71ae9a7d4b0df1c0b (patch) | |
| tree | a7615ba63c811f28002e54ab35d58903843abba2 /indra/newview/pipeline.cpp | |
| parent | 03997a320a288a71964221d4d14b1ced9c822214 (diff) | |
EXT-7179 FIXED Wireframe mode is mostly useless in trunk (204029)
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 4fbc6bb5da..05f14ff8f4 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -635,7 +635,8 @@ void LLPipeline::updateRenderDeferred() LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") && gSavedSettings.getBOOL("VertexShaderEnable") && gSavedSettings.getBOOL("RenderAvatarVP") && - gSavedSettings.getBOOL("WindLightUseAtmosShaders")) ? TRUE : FALSE; + (gSavedSettings.getBOOL("WindLightUseAtmosShaders")) ? TRUE : FALSE) && + !gUseWireframe; sRenderDeferred = deferred; } @@ -6571,12 +6572,12 @@ void LLPipeline::renderDeferredLighting() if (LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_DEFERRED) > 2) { mDeferredLight[1].bindTarget(); - mDeferredLight[1].clear(GL_COLOR_BUFFER_BIT); + // clear color buffer here? doesn't seem to matter. } else { mScreen.bindTarget(); - mScreen.clear(GL_COLOR_BUFFER_BIT); + // clear color buffer here? doesn't seem to matter. } if (gSavedSettings.getBOOL("RenderDeferredAtmospheric")) |