diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-05-06 10:28:42 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-05-06 10:28:42 -0400 |
| commit | 950c41d184b340a7a3370c2cbda5d1eed9a17b0b (patch) | |
| tree | 373912394af6834d7d56258becf46954244b8423 /indra/llmath | |
| parent | 20198b750d02c769ab6845226f98ce6e5dd1f20b (diff) | |
| parent | 7f5e6cea124e1193b199a3eabd50bdab96340c13 (diff) | |
merge 4.0.4-release and MAINT-5974
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/llrect.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llmath/llrect.h b/indra/llmath/llrect.h index c51e0e0ae6..58f02d4d2b 100644 --- a/indra/llmath/llrect.h +++ b/indra/llmath/llrect.h @@ -118,8 +118,10 @@ public: if (end_y < mBottom) clip_y = end_y - mBottom; // clip_? and delta_? should have same sign, since starting point is in rect // so ratios will be positive - F32 ratio_x = ((F32)clip_x / (F32)delta_x); - F32 ratio_y = ((F32)clip_y / (F32)delta_y); + F32 ratio_x = 0; + F32 ratio_y = 0; + if (delta_x != 0) ratio_x = ((F32)clip_x / (F32)delta_x); + if (delta_y != 0) ratio_y = ((F32)clip_y / (F32)delta_y); if (ratio_x > ratio_y) { // clip along x direction |