diff options
| author | simon <none@none> | 2013-05-09 15:30:49 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-05-09 15:30:49 -0700 |
| commit | 5687b0c4df5c28cb6aa6cb33cf0d2c4bbe1b912e (patch) | |
| tree | 8d1f9f3044adeb81778769fef0f57349fb5ca72f /indra/llmath | |
| parent | ee2fce8790b69d61845cc32fbf7cdce8a33b0dab (diff) | |
| parent | 50bbb0b7ed542a5f9dee4f347531537beecddd26 (diff) | |
Merge
Diffstat (limited to 'indra/llmath')
| -rwxr-xr-x | 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 100755 --- 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) { |