diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-03-06 14:31:51 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-03-06 14:31:51 -0500 |
| commit | 61bddc22d97150cd590bc4184355133b6dd3ff87 (patch) | |
| tree | 59b488c8c4edc51096338fab153d9eaf837d27fe /indra/newview/pipeline.cpp | |
| parent | a18d4df6c742aa397b70e4dafb41475bd201a558 (diff) | |
| parent | 08ed7f676f2ce38937a03c2a4e823e3564981264 (diff) | |
merge changes for 5.0.2-release
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 890839e6e6..19487c3230 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -7773,12 +7773,10 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield) F32 fov = LLViewerCamera::getInstance()->getView(); const F32 default_fov = CameraFieldOfView * F_PI/180.f; - //const F32 default_aspect_ratio = gSavedSettings.getF32("CameraAspectRatio"); //F32 aspect_ratio = (F32) mScreen.getWidth()/(F32)mScreen.getHeight(); F32 dv = 2.f*default_focal_length * tanf(default_fov/2.f); - //F32 dh = 2.f*default_focal_length * tanf(default_fov*default_aspect_ratio/2.f); F32 focal_length = dv/(2*tanf(fov/2.f)); |