diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-03-01 15:22:17 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-03-01 15:22:17 -0600 |
| commit | 5eeca73940bb083e76cb73d1528e61544d3f7fd2 (patch) | |
| tree | d958e4caa6cebd64aa616c850408080e74b4cf8e /indra/newview/llvovolume.cpp | |
| parent | 10f14598243ef93f8990f9a1473334ef918f9cf7 (diff) | |
SH-1072 Fix for DoF focal point being incorrect.
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index e3cc2f2589..132e50904a 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -3365,8 +3365,15 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& e end_face = face+1;
}
+ bool special_cursor = specialHoverCursor();
for (S32 i = start_face; i < end_face; ++i)
{
+ if (!special_cursor && !pick_transparent && getTE(i)->getColor().mV[3] == 0.f)
+ { //don't attempt to pick completely transparent faces unless
+ //pick_transparent is true
+ continue;
+ }
+
face_hit = volume->lineSegmentIntersect(v_start, v_end, i,
&p, &tc, &n, &bn);
|