From 7eba473723a260a1025b5a865715573b2369298e Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Mon, 24 May 2010 14:01:18 -0500
Subject: Fix for bad indexes on cube faces. Extra validation on vertex
 buffers.

---
 indra/newview/llface.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llface.cpp')

diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 77e8a6fdf9..a65ee52fa1 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -368,10 +368,13 @@ void LLFace::setDrawable(LLDrawable *drawable)
 
 void LLFace::setSize(const S32 num_vertices, const S32 num_indices)
 {
-	if (mGeomCount != num_vertices ||
+	//allocate vertices in blocks of 4 for alignment
+	S32 num_verts = (num_vertices + 0x3) & ~0x3;
+
+	if (mGeomCount != num_verts ||
 		mIndicesCount != num_indices)
 	{
-		mGeomCount    = num_vertices;
+		mGeomCount    = num_verts;
 		mIndicesCount = num_indices;
 		mVertexBuffer = NULL;
 		mLastVertexBuffer = NULL;
-- 
cgit v1.2.3