diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-05-20 14:56:10 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-05-20 14:56:10 -0400 |
| commit | 6f5313caea9bb8458dca23bbaf4f10cd6641c7fb (patch) | |
| tree | ac34191250860e5f250cf1cc2e9199cdaa8204f6 /indra/newview/llpolymesh.cpp | |
| parent | eb8221338e0276b9afe8d92738166f97782d48d6 (diff) | |
| parent | 0b612741d53a044a0179e1c32018bf8cd4213631 (diff) | |
automated merge mesh-development -> davep-mesh-candidate-2010
Diffstat (limited to 'indra/newview/llpolymesh.cpp')
| -rw-r--r-- | indra/newview/llpolymesh.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpolymesh.cpp b/indra/newview/llpolymesh.cpp index 4b2c569cc3..450f9b2be7 100644 --- a/indra/newview/llpolymesh.cpp +++ b/indra/newview/llpolymesh.cpp @@ -770,7 +770,7 @@ LLPolyMesh::LLPolyMesh(LLPolyMeshSharedData *shared_data, LLPolyMesh *reference_ int nverts = mSharedData->mNumVertices; 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); + mVertexData = (F32*) ll_aligned_malloc_16(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; } - free(mVertexData); + ll_aligned_free_16(mVertexData); } |