summaryrefslogtreecommitdiff
path: root/indra/newview/llface.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-05-24 23:34:50 -0500
committerDave Parks <davep@lindenlab.com>2010-05-24 23:34:50 -0500
commit051d55e9e417d1f70e4a0dcee0035f6e2a413792 (patch)
tree58a1c3b198f42d21d63d00802ebdfca93155a0ea /indra/newview/llface.cpp
parent62ccc5bb7e9d2c7a1531f2c01b8258e8c8cdfb1a (diff)
Terrain is no longer mutilated.
Diffstat (limited to 'indra/newview/llface.cpp')
-rw-r--r--indra/newview/llface.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index a65ee52fa1..679875e6bd 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -366,15 +366,18 @@ void LLFace::setDrawable(LLDrawable *drawable)
mXform = &drawable->mXform;
}
-void LLFace::setSize(const S32 num_vertices, const S32 num_indices)
+void LLFace::setSize(S32 num_vertices, S32 num_indices, bool align)
{
- //allocate vertices in blocks of 4 for alignment
- S32 num_verts = (num_vertices + 0x3) & ~0x3;
+ if (align)
+ {
+ //allocate vertices in blocks of 4 for alignment
+ S32 num_vertices = (num_vertices + 0x3) & ~0x3;
+ }
- if (mGeomCount != num_verts ||
+ if (mGeomCount != num_vertices ||
mIndicesCount != num_indices)
{
- mGeomCount = num_verts;
+ mGeomCount = num_vertices;
mIndicesCount = num_indices;
mVertexBuffer = NULL;
mLastVertexBuffer = NULL;