diff options
author | Dave Houlton <euclid@lindenlab.com> | 2021-02-01 15:59:08 -0700 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2021-02-01 15:59:08 -0700 |
commit | f07b332ef0aafd1ecb82b6077309a5292c9cddc1 (patch) | |
tree | a76fabd4f71bdbb86b7fe6efb9a6acc0529a429c /indra/llmath | |
parent | baa81473149b9d5a6718529c4de08393e8a02b92 (diff) | |
parent | 21565a1f3fe1ae737e2f91c58be2c3cb0b5a2fec (diff) |
Merge branch 'master' into DV525-merge-6.4.13
Diffstat (limited to 'indra/llmath')
-rw-r--r-- | indra/llmath/llvolume.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index 7da53bf8c8..e085fa6ada 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -5241,9 +5241,9 @@ public: LLVCacheTriangleData* tri = *iter; if (tri->mActive) { - tri->mScore = tri->mVertex[0]->mScore; - tri->mScore += tri->mVertex[1]->mScore; - tri->mScore += tri->mVertex[2]->mScore; + tri->mScore = tri->mVertex[0] ? tri->mVertex[0]->mScore : 0; + tri->mScore += tri->mVertex[1] ? tri->mVertex[1]->mScore : 0; + tri->mScore += tri->mVertex[2] ? tri->mVertex[2]->mScore : 0; if (!mBestTriangle || mBestTriangle->mScore < tri->mScore) { |