diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-05-09 15:40:32 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-05-09 15:40:32 -0500 |
| commit | 50bbb0b7ed542a5f9dee4f347531537beecddd26 (patch) | |
| tree | 619d276c935c7db2ff3cecd6bb41808c82e6b479 /indra/llmath | |
| parent | cd8e0b92e1c8f9f8544b1011e61c21c7789b93b7 (diff) | |
| parent | be9f71d16660e37fb058ddf05f20e6a80a272862 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/llvolume.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index 602f2c29e5..7751ef87ee 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -4520,7 +4520,11 @@ LLVolumeFace& LLVolumeFace::operator=(const LLVolumeFace& src) S32 tc_size = (mNumVertices*sizeof(LLVector2)+0xF) & ~0xF; LLVector4a::memcpyNonAliased16((F32*) mPositions, (F32*) src.mPositions, vert_size); - LLVector4a::memcpyNonAliased16((F32*) mNormals, (F32*) src.mNormals, vert_size); + + if (src.mNormals) + { + LLVector4a::memcpyNonAliased16((F32*) mNormals, (F32*) src.mNormals, vert_size); + } if(src.mTexCoords) { |