summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-11-11 16:36:00 -0800
committerLeslie Linden <leslie@lindenlab.com>2011-11-11 16:36:00 -0800
commite7daefeb4d09ff7726e8865d5323b2c1e6ffe9a8 (patch)
treeaf94f20c12e56792efbac84a4901a4098fcee0f7 /indra/newview
parent3b2c8a1da0fc1aa40838b94d704921b6f8f11c5f (diff)
SH-2620 -- Enabled FXAA on OSX, which fixes the issue with latest code and some assorted shader cleanup from changeset e156c46db1b2
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/pipeline.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 226db5a520..af96a042a1 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -6422,10 +6422,6 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield)
bool multisample = RenderFSAASamples > 1 && mFXAABuffer.isComplete();
-#if LL_DARWIN //force FXAA to off on OSX (SH-2620)
- multisample = false;
-#endif
-
gViewerWindow->setup3DViewport();
if (dof_enabled)