From 051d55e9e417d1f70e4a0dcee0035f6e2a413792 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Mon, 24 May 2010 23:34:50 -0500 Subject: Terrain is no longer mutilated. --- indra/newview/llface.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'indra/newview/llface.cpp') 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; -- cgit v1.2.3