diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-04-15 14:13:00 -0700 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-04-15 14:13:00 -0700 |
| commit | 4fe28de53a7467809f791790bf889d36c93eaa0b (patch) | |
| tree | e7220f530f1ce817ff092360dd87d83c82794ca8 /indra/llrender | |
| parent | 5b64be097f319d7d2f20e0b1fd803a3644544dc3 (diff) | |
| parent | fed0e3376f24d3fbd036633a1d6916bef38a2d54 (diff) | |
Merge
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 8addee606b..ff47c57c70 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -1738,8 +1738,18 @@ BOOL LLImageGL::getMask(const LLVector2 &tc) if (mPickMask) { - F32 u = tc.mV[0] - floorf(tc.mV[0]); - F32 v = tc.mV[1] - floorf(tc.mV[1]); + F32 u,v; + if (LL_LIKELY(tc.isFinite())) + { + u = tc.mV[0] - floorf(tc.mV[0]); + v = tc.mV[1] - floorf(tc.mV[1]); + } + else + { + LL_WARNS_ONCE("render") << "Ugh, non-finite u/v in mask pick" << LL_ENDL; + u = v = 0.f; + llassert(false); + } if (LL_UNLIKELY(u < 0.f || u > 1.f || v < 0.f || v > 1.f)) |