Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/editors/util/navmesh_conversion.cpp4
1 files changed, 4 insertions, 0 deletions
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