diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-05-07 17:21:32 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-05-07 17:21:32 -0500 |
| commit | 592586052c9f0b4a189e5ebdeecb737ecd2eed9c (patch) | |
| tree | 5cac6cd846b20b7d0282277c2ae6ef01a2660f0b /indra/llmath | |
| parent | 2a59fef6beff7144085ea98ede4a3b4300248d7f (diff) | |
| parent | dbfcd6c9c5709b74365c2538ba312685b09d22bf (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) { |