summaryrefslogtreecommitdiff
path: root/indra/newview/llpolymesh.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-05-13 10:29:52 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-05-13 10:29:52 -0400
commit4046e0801ba4f7a01311de06b110177630ea6e04 (patch)
tree47ad154496cb50ef39617cf1b9ddc147d1358076 /indra/newview/llpolymesh.cpp
parent40325a7347a059f913e01b449c924b13d1471e23 (diff)
parent8017900e7f536663153451ff788d8662427782ed (diff)
merge
Diffstat (limited to 'indra/newview/llpolymesh.cpp')
-rw-r--r--indra/newview/llpolymesh.cpp4
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);
}