diff options
author | Dave Parks <davep@lindenlab.com> | 2012-06-26 16:13:09 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2012-06-26 16:13:09 -0500 |
commit | ba8ddcf2419dbc20e4045ebfae93a63fb34b9047 (patch) | |
tree | a00fe6a50635de349fee5018b5ef20b40927c076 /indra/newview | |
parent | 28ccf4190e83670af2f03015ac16db6b9c76c805 (diff) |
MAINT-675 Fix for DoF focal point being incorrect when alt-zooming on terrain.
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/pipeline.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 4ad0497954..094a8ce111 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -6769,15 +6769,8 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield) } else { - LLViewerObject* obj = gAgentCamera.getFocusObject(); - if (obj) - { //focus on alt-zoom target - focus_point = LLVector3(gAgentCamera.getFocusGlobal()-gAgent.getRegion()->getOriginGlobal()); - } - else - { //focus on your avatar - focus_point = gAgent.getPositionAgent(); - } + //focus on alt-zoom target + focus_point = LLVector3(gAgentCamera.getFocusGlobal()-gAgent.getRegion()->getOriginGlobal()); } } |