summaryrefslogtreecommitdiff
path: root/indra/llmath/llvolume.cpp
diff options
context:
space:
mode:
authorGraham Madarasz (Graham Linden) <graham@lindenlab.com>2013-03-13 16:16:17 -0700
committerGraham Madarasz (Graham Linden) <graham@lindenlab.com>2013-03-13 16:16:17 -0700
commit9a811855b9470accba062e10fd2f591588492ab2 (patch)
treead7ad314c7785d9e87ef9b2dfb635f84f3048a51 /indra/llmath/llvolume.cpp
parent9a7a19c77ad1b143c7acfa915af7887e417253f1 (diff)
parent5d2fea6262d91eb8d3c06d97a160ca9373b96889 (diff)
Merge
Diffstat (limited to 'indra/llmath/llvolume.cpp')
-rw-r--r--indra/llmath/llvolume.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index edd16b5688..602f2c29e5 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -4729,13 +4729,13 @@ void LLVolumeFace::optimize(F32 angle_cutoff)
}
}
- // disallow data amplification
+ // Only swap data if we've actually optimized the mesh
//
if (new_face.mNumVertices <= mNumVertices)
{
- llassert(new_face.mNumIndices == mNumIndices);
- swapData(new_face);
- }
+ llassert(new_face.mNumIndices == mNumIndices);
+ swapData(new_face);
+ }
}
class LLVCacheTriangleData;