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/blender/blenkernel/intern/navmesh_conversion.c | |
| parent | 68cc7e168207c4c519f54f7e0f7f638768386cd0 (diff) | |
| parent | 050963b6a9529e0abdd597d163ddc4343c0b15c2 (diff) | |
svn merge ^/trunk/blender -r43830:43864
Diffstat (limited to 'source/blender/blenkernel/intern/navmesh_conversion.c')
| -rw-r--r-- | source/blender/blenkernel/intern/navmesh_conversion.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/navmesh_conversion.c b/source/blender/blenkernel/intern/navmesh_conversion.c index 72523ae54e0..4c9c0a3a1fc 100644 --- a/source/blender/blenkernel/intern/navmesh_conversion.c +++ b/source/blender/blenkernel/intern/navmesh_conversion.c @@ -344,7 +344,7 @@ int buildNavMeshData(const int nverts, const float* verts, int *vertsPerPoly_r, int **dtrisToPolysMap_r, int **dtrisToTrisMap_r) { - int *trisMapping = MEM_callocN(sizeof(int)*ntris, "buildNavMeshData trisMapping"); + int *trisMapping; int i; struct SortContext context; int validTriStart, prevPolyIdx, curPolyIdx, newPolyIdx, prevpolyidx; @@ -360,6 +360,8 @@ int buildNavMeshData(const int nverts, const float* verts, return 0; } + trisMapping = MEM_callocN(sizeof(int)*ntris, "buildNavMeshData trisMapping"); + //sort the triangles by polygon idx for (i=0; i<ntris; i++) trisMapping[i]=i; |