diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-03 05:30:21 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-03 05:30:21 +0400 |
| commit | 075fee4d58a65b4313bb7e984ae195690f4c7bfd (patch) | |
| tree | e801da2591eda34a4c4c7fd5436ff476353b1c55 /source/gameengine | |
| parent | 68cc7e168207c4c519f54f7e0f7f638768386cd0 (diff) | |
| parent | 050963b6a9529e0abdd597d163ddc4343c0b15c2 (diff) | |
svn merge ^/trunk/blender -r43830:43864
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Ketsji/KX_NavMeshObject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/KX_NavMeshObject.cpp b/source/gameengine/Ketsji/KX_NavMeshObject.cpp index 3b63c85feea..e6f8d7175dc 100644 --- a/source/gameengine/Ketsji/KX_NavMeshObject.cpp +++ b/source/gameengine/Ketsji/KX_NavMeshObject.cpp @@ -248,7 +248,7 @@ bool KX_NavMeshObject::BuildVertIndArrays(float *&vertices, int& nverts, } //create tris - polys = new unsigned short[npolys*3*2]; + polys = (unsigned short*)MEM_callocN(sizeof(unsigned short)*3*2*npolys, "BuildVertIndArrays polys"); memset(polys, 0xff, sizeof(unsigned short)*3*2*npolys); unsigned short *poly = polys; RAS_Polygon* raspoly; |