From e52613aad6bc2a9ec2b20171e59fee5a124d5765 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Thu, 7 Apr 2011 00:27:48 -0500 Subject: SH-1318 Add check box for disabling depth of field. --- indra/newview/pipeline.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/pipeline.cpp') diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 5f74423c7b..bf65fd123e 100755 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -6314,8 +6314,8 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield) F32 fnumber = gSavedSettings.getF32("CameraFNumber"); F32 default_focal_length = gSavedSettings.getF32("CameraFocalLength"); - if (LLToolMgr::getInstance()->inBuildMode()) - { //squish focal length when in build mode so DoF doesn't make editing objects difficult + if (LLToolMgr::getInstance()->inBuildMode() || !gSavedSettings.getBOOL("RenderDepthOfField")) + { //squish focal length when in build mode (or if DoF is disabled) so DoF doesn't make editing objects difficult default_focal_length = 5.f; } -- cgit v1.3