From bdd4aa27b0747bf7bc4af7e23a79b3fbdd3ee5b0 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Sat, 10 Sep 2011 14:12:15 +0000 Subject: Another set of fixes for recats: osx uses different order of arguments for sort_r and it's callback. Also do not use char constants like 'NAVM' which is casting to int. And added defautl section to switch in KX_NavMeshObject::DrawNavMesh. --- source/blender/editors/util/navmesh_conversion.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source/blender') diff --git a/source/blender/editors/util/navmesh_conversion.cpp b/source/blender/editors/util/navmesh_conversion.cpp index aebd9624bc7..4d89f78bdf5 100644 --- a/source/blender/editors/util/navmesh_conversion.cpp +++ b/source/blender/editors/util/navmesh_conversion.cpp @@ -280,6 +280,8 @@ struct SortContext }; #if defined(_MSC_VER) static int compareByData(void* data, const void * a, const void * b) +#elif defined(__APPLE__) +static int compareByData(void* data, const void * a, const void * b) #else static int compareByData(const void * a, const void * b, void* data) #endif @@ -312,6 +314,8 @@ bool buildNavMeshData(const int nverts, const float* verts, context.trisToFacesMap = trisToFacesMap; #if defined(_MSC_VER) qsort_s(trisMapping, ntris, sizeof(int), compareByData, &context); +#elif defined(__APPLE__) + qsort_r(trisMapping, ntris, sizeof(int), &context, compareByData); #else qsort_r(trisMapping, ntris, sizeof(int), compareByData, &context); #endif -- cgit v1.2.3