diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-12-03 03:52:57 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-12-03 03:52:57 -0600 |
| commit | ec9ba94b69e259347f71fbbcec2f0f8fe43a47a7 (patch) | |
| tree | b83b0182239a1d4a46e8cd97c5d55495001f6320 /indra/newview/pipeline.cpp | |
| parent | 0db5669b68ecb46db9161782ff42d320b4c331b7 (diff) | |
DoF tweaks -- halo hiding, etc.
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index fa156c85e3..f0446b024c 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -6174,8 +6174,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield) //adjust focal length for zoom F32 fov = LLViewerCamera::getInstance()->getView(); - F32 default_fov = LLViewerCamera::getInstance()->getDefaultFOV(); - focal_length *= default_fov/fov; + focal_length *= 1.f/fov; F32 near_focal_distance = hyperfocal_distance*subject_distance/(hyperfocal_distance+subject_distance); @@ -6197,7 +6196,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield) if (channel > -1) { mScreen.bindTexture(0, channel); - gGL.getTexUnit(0)->setTextureFilteringOption(LLTexUnit::TFO_BILINEAR); + gGL.getTexUnit(0)->setTextureFilteringOption(LLTexUnit::TFO_POINT); } gGL.begin(LLRender::TRIANGLE_STRIP); |