Revision: 40101
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40101
Author: nazgul
Date: 2011-09-10 14:55:14 +0000 (Sat, 10 Sep 2011)
Log Message:
-----------
Fixed for navmesh on FreeBSD. Oatch by sambler, thanks!
Modified Paths:
--------------
trunk/blender/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
trunk/blender/source/blender/editors/util/navmesh_conversion.cpp
Modified:
trunk/blender/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
===================================================================
--- trunk/blender/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
2011-09-10 14:28:34 UTC (rev 40100)
+++ trunk/blender/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
2011-09-10 14:55:14 UTC (rev 40101)
@@ -97,7 +97,7 @@
#if defined(_MSC_VER)
static int ptcmp(void* up, const void *v1, const void *v2)
-#elif defined(__APPLE__)
+#elif defined(__APPLE__) || defined(__FreeBSD__)
static int ptcmp(void* up, const void *v1, const void *v2)
#else
static int ptcmp(const void *v1, const void *v2, void* up)
@@ -124,7 +124,7 @@
idx[i] = i;
#if defined(_MSC_VER)
qsort_s(&idx[0], idx.size(), sizeof(int), ptcmp, verts);
-#elif defined(__APPLE__)
+#elif defined(__APPLE__) || defined(__FreeBSD__)
qsort_r(&idx[0], idx.size(), sizeof(int), verts, ptcmp);
#else
qsort_r(&idx[0], idx.size(), sizeof(int), ptcmp, verts);
Modified: trunk/blender/source/blender/editors/util/navmesh_conversion.cpp
===================================================================
--- trunk/blender/source/blender/editors/util/navmesh_conversion.cpp
2011-09-10 14:28:34 UTC (rev 40100)
+++ trunk/blender/source/blender/editors/util/navmesh_conversion.cpp
2011-09-10 14:55:14 UTC (rev 40101)
@@ -280,7 +280,7 @@
};
#if defined(_MSC_VER)
static int compareByData(void* data, const void * a, const void * b)
-#elif defined(__APPLE__)
+#elif defined(__APPLE__) || defined(__FreeBSD__)
static int compareByData(void* data, const void * a, const void * b)
#else
static int compareByData(const void * a, const void * b, void* data)
@@ -314,7 +314,7 @@
context.trisToFacesMap = trisToFacesMap;
#if defined(_MSC_VER)
qsort_s(trisMapping, ntris, sizeof(int), compareByData, &context);
-#elif defined(__APPLE__)
+#elif defined(__APPLE__) || defined(__FreeBSD__)
qsort_r(trisMapping, ntris, sizeof(int), &context, compareByData);
#else
qsort_r(trisMapping, ntris, sizeof(int), compareByData, &context);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
