diff options
author | Dave Parks <davep@lindenlab.com> | 2011-04-12 17:22:02 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-04-12 17:22:02 -0500 |
commit | 13e12b2773ebd784281e76a1ec488c532962f765 (patch) | |
tree | 6f89bccf8b94fe28f37d33777d254a1d2d736b13 | |
parent | 48285958d051a56ffeca0a2bfeb8b4464982c4f1 (diff) |
Fix for bad merge causing crash in llpolymorph.cpp
-rw-r--r-- | indra/newview/llpolymesh.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llpolymesh.cpp b/indra/newview/llpolymesh.cpp index 90e835cda8..24f84b2ddf 100644 --- a/indra/newview/llpolymesh.cpp +++ b/indra/newview/llpolymesh.cpp @@ -768,9 +768,9 @@ LLPolyMesh::LLPolyMesh(LLPolyMeshSharedData *shared_data, LLPolyMesh *reference_ // Allocate memory without initializing every vector // NOTE: This makes asusmptions about the size of LLVector[234] int nverts = mSharedData->mNumVertices; - int nfloats = nverts * (3*5 + 2 + 4); - //use 16 byte aligned vertex data to make LLPolyMesh SSE friendly - mVertexData = new F32[nfloats]; + int nfloats = nverts * (2*4 + 3*3 + 2 + 4);
+ //use 16 byte aligned vertex data to make LLPolyMesh SSE friendly
+ mVertexData = (F32*) malloc(nfloats*4);
int offset = 0; mCoords = (LLVector4*)(mVertexData + offset); offset += 4*nverts; mNormals = (LLVector4*)(mVertexData + offset); offset += 4*nverts; @@ -799,7 +799,7 @@ LLPolyMesh::~LLPolyMesh() mJointRenderData[i] = NULL; } - delete [] mVertexData; + free(mVertexData); } |