diff --git a/Detour/Include/DetourNavMeshQuery.h b/Detour/Include/DetourNavMeshQuery.h
index d85814d..d66bf2f 100644
--- a/Detour/Include/DetourNavMeshQuery.h
+++ b/Detour/Include/DetourNavMeshQuery.h
@@ -300,9 +300,11 @@ public:
 	// Params:
 	//  ref - (in) ref to the polygon.
 	//  filter - (in) path polygon filter.
-	//  segments[DT_VERTS_PER_POLYGON*3*2] - (out) wall segments.
+	//  segments[6*maxSegments] - (out) wall segments (2 endpoints per segment).
+	//  maxSegments - (in) max number of segments that can be stored in 'segments'.
 	// Returns: Number of wall segments.
-	int getPolyWallSegments(dtPolyRef ref, const dtQueryFilter* filter, float* segments);
+	int getPolyWallSegments(dtPolyRef ref, const dtQueryFilter* filter,
+							float* segments, const int maxSegments);
 	
 	// Returns closest point on navigation polygon.
 	// Uses detail polygons to find the closest point to the navigation polygon surface. 
diff --git a/Detour/Source/DetourNavMeshQuery.cpp b/Detour/Source/DetourNavMeshQuery.cpp
index d2f31a8..e8387e1 100644
--- a/Detour/Source/DetourNavMeshQuery.cpp
+++ b/Detour/Source/DetourNavMeshQuery.cpp
@@ -2147,7 +2147,8 @@ static void insertInterval(dtSegInterval* ints, int& nints, const int maxInts,
 	nints++;
 }
 
-int dtNavMeshQuery::getPolyWallSegments(dtPolyRef ref, const dtQueryFilter* filter, float* segments)
+int dtNavMeshQuery::getPolyWallSegments(dtPolyRef ref, const dtQueryFilter* filter,
+										float* segments, const int maxSegments)
 {
 	dtAssert(m_nav);
 	
@@ -2210,7 +2211,7 @@ int dtNavMeshQuery::getPolyWallSegments(dtPolyRef ref, const dtQueryFilter* filt
 			if (imin == imax) continue;
 			if (imin == 0 && imax == 255)
 			{
-				if (n < DT_VERTS_PER_POLYGON)
+				if (n < maxSegments)
 				{
 					float* seg = &segments[n*6];
 					n++;
@@ -2222,7 +2223,7 @@ int dtNavMeshQuery::getPolyWallSegments(dtPolyRef ref, const dtQueryFilter* filt
 			{
 				const float tmin = imin/255.0f; 
 				const float tmax = imax/255.0f; 
-				if (n < DT_VERTS_PER_POLYGON)
+				if (n < maxSegments)
 				{
 					float* seg = &segments[n*6];
 					n++;
diff --git a/RecastDemo/Bin/Recast.app/Contents/MacOS/Recast b/RecastDemo/Bin/Recast.app/Contents/MacOS/Recast
index 591dccc..f1f90f0 100755
Binary files a/RecastDemo/Bin/Recast.app/Contents/MacOS/Recast and b/RecastDemo/Bin/Recast.app/Contents/MacOS/Recast differ
diff --git a/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.pbxuser b/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.pbxuser
index b448185..f0de2aa 100644
--- a/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.pbxuser
+++ b/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.pbxuser
@@ -9,7 +9,7 @@
 		};
 	};
 	29B97313FDCFA39411CA2CEA /* Project object */ = {
-		activeBuildConfigurationName = Debug;
+		activeBuildConfigurationName = Release;
 		activeExecutable = 6B8632970F78114600E2684A /* Recast */;
 		activeTarget = 8D1107260486CEB800E47090 /* Recast */;
 		addToTargets = (
@@ -131,140 +131,97 @@
 			PBXWorkspaceStateSaveDate = 308397458;
 		};
 		perUserProjectItems = {
-			6B1C8E08121EB4FF0048697F = 6B1C8E08121EB4FF0048697F /* PBXTextBookmark */;
-			6B4214D911803923006C347B = 6B4214D911803923006C347B /* PBXTextBookmark */;
-			6B847515122B9F4900ADF63D = 6B847515122B9F4900ADF63D /* PBXTextBookmark */;
-			6B8476F9122D000800ADF63D = 6B8476F9122D000800ADF63D /* PBXTextBookmark */;
-			6B847779122D223D00ADF63D = 6B847779122D223D00ADF63D /* PBXTextBookmark */;
-			6B84778B122D279700ADF63D = 6B84778B122D279700ADF63D /* PBXTextBookmark */;
-			6B8477BB122D297200ADF63D = 6B8477BB122D297200ADF63D /* PBXTextBookmark */;
-			6B8477E1122D2B9100ADF63D = 6B8477E1122D2B9100ADF63D /* PBXTextBookmark */;
-			6B8477EE122D2CC900ADF63D = 6B8477EE122D2CC900ADF63D /* PBXTextBookmark */;
-			6B8477FC122D2E2A00ADF63D = 6B8477FC122D2E2A00ADF63D /* PBXTextBookmark */;
-			6B8477FD122D2E2A00ADF63D = 6B8477FD122D2E2A00ADF63D /* PBXTextBookmark */;
-			6B8477FE122D2E2A00ADF63D = 6B8477FE122D2E2A00ADF63D /* PBXTextBookmark */;
-			6B8477FF122D2E2A00ADF63D = 6B8477FF122D2E2A00ADF63D /* PBXTextBookmark */;
-			6B920A521225C0AC00D5B5AD = 6B920A521225C0AC00D5B5AD /* PBXTextBookmark */;
-			6B920A6D1225C5DD00D5B5AD = 6B920A6D1225C5DD00D5B5AD /* PBXTextBookmark */;
-			6B920AA81225DBCB00D5B5AD = 6B920AA81225DBCB00D5B5AD /* PBXTextBookmark */;
-			6B98462E11E6141900FA177B = 6B98462E11E6141900FA177B /* PBXTextBookmark */;
-			6B98473011E737D800FA177B = 6B98473011E737D800FA177B /* PBXTextBookmark */;
-			6BA6876E1222F02E00730711 = 6BA6876E1222F02E00730711 /* PBXTextBookmark */;
-			6BA687831222F42100730711 = 6BA687831222F42100730711 /* PBXTextBookmark */;
-			6BA687881222F4DB00730711 = 6BA687881222F4DB00730711 /* PBXTextBookmark */;
-			6BA687CA1222FA9300730711 = 6BA687CA1222FA9300730711 /* PBXTextBookmark */;
-			6BA7F8AC1226EF0400C8C47A = 6BA7F8AC1226EF0400C8C47A /* PBXTextBookmark */;
-			6BA7F8D01226EF9D00C8C47A = 6BA7F8D01226EF9D00C8C47A /* PBXTextBookmark */;
-			6BA7F8EC1227002300C8C47A = 6BA7F8EC1227002300C8C47A /* PBXTextBookmark */;
-			6BA7F8ED1227002300C8C47A = 6BA7F8ED1227002300C8C47A /* PBXTextBookmark */;
-			6BA7F8EE1227002300C8C47A = 6BA7F8EE1227002300C8C47A /* PBXTextBookmark */;
-			6BA8CEC01255BCE600272A3B = 6BA8CEC01255BCE600272A3B /* PBXTextBookmark */;
-			6BA8CECB1255C1A400272A3B = 6BA8CECB1255C1A400272A3B /* PBXTextBookmark */;
-			6BA8CECD1255C1A400272A3B = 6BA8CECD1255C1A400272A3B /* PBXTextBookmark */;
-			6BA8CEEF1255C4B700272A3B = 6BA8CEEF1255C4B700272A3B /* PBXTextBookmark */;
-			6BA8CF4A1255D44700272A3B = 6BA8CF4A1255D44700272A3B /* PBXTextBookmark */;
-			6BA8CF4D1255D44700272A3B = 6BA8CF4D1255D44700272A3B /* PBXTextBookmark */;
-			6BA8CF501255D44700272A3B = 6BA8CF501255D44700272A3B /* PBXTextBookmark */;
-			6BA8CF511255D44700272A3B = 6BA8CF511255D44700272A3B /* PBXTextBookmark */;
-			6BA8CF5B1255D49B00272A3B = 6BA8CF5B1255D49B00272A3B /* PBXTextBookmark */;
-			6BA8CF6F1255D50700272A3B = 6BA8CF6F1255D50700272A3B /* PBXTextBookmark */;
-			6BA8CF7B1255D5FE00272A3B = 6BA8CF7B1255D5FE00272A3B /* PBXTextBookmark */;
-			6BA8CF7C1255D5FE00272A3B = 6BA8CF7C1255D5FE00272A3B /* PBXTextBookmark */;
-			6BA8CF941255D97400272A3B = 6BA8CF941255D97400272A3B /* PBXTextBookmark */;
-			6BA8CF951255D97400272A3B = 6BA8CF951255D97400272A3B /* PBXTextBookmark */;
-			6BA8CFA81255DC6500272A3B = 6BA8CFA81255DC6500272A3B /* PBXTextBookmark */;
-			6BA8CFBE1255DE0500272A3B = 6BA8CFBE1255DE0500272A3B /* PBXTextBookmark */;
-			6BA8D10B125B0E8E00272A3B = 6BA8D10B125B0E8E00272A3B /* PBXTextBookmark */;
-			6BA8D10C125B0E8E00272A3B = 6BA8D10C125B0E8E00272A3B /* PBXTextBookmark */;
-			6BA8D10D125B0E8E00272A3B = 6BA8D10D125B0E8E00272A3B /* PBXTextBookmark */;
-			6BAF3E781212869F008CFCDF = 6BAF3E781212869F008CFCDF /* PBXTextBookmark */;
-			6BAF404F12140B4E008CFCDF = 6BAF404F12140B4E008CFCDF /* PBXTextBookmark */;
-			6BAF4321121AF998008CFCDF = 6BAF4321121AF998008CFCDF /* PBXTextBookmark */;
-			6BAF4421121C25E3008CFCDF = 6BAF4421121C25E3008CFCDF /* PBXTextBookmark */;
-			6BAF4525121D1723008CFCDF = 6BAF4525121D1723008CFCDF /* PBXTextBookmark */;
-			6BAF46D3121D8FF1008CFCDF = 6BAF46D3121D8FF1008CFCDF /* PBXTextBookmark */;
-			6BB2EDD5125FC12900E350F8 = 6BB2EDD5125FC12900E350F8 /* PBXTextBookmark */;
-			6BB2EDD6125FC12900E350F8 = 6BB2EDD6125FC12900E350F8 /* PBXTextBookmark */;
-			6BB2EDD8125FC12900E350F8 = 6BB2EDD8125FC12900E350F8 /* PBXTextBookmark */;
-			6BB2EDEC1261C59300E350F8 /* PBXTextBookmark */ = 6BB2EDEC1261C59300E350F8 /* PBXTextBookmark */;
-			6BB2EDF61261C75400E350F8 /* PBXTextBookmark */ = 6BB2EDF61261C75400E350F8 /* PBXTextBookmark */;
-			6BB2EDF71261C75400E350F8 /* PBXTextBookmark */ = 6BB2EDF71261C75400E350F8 /* PBXTextBookmark */;
-			6BB2EDF81261C75400E350F8 /* PBXTextBookmark */ = 6BB2EDF81261C75400E350F8 /* PBXTextBookmark */;
+			6B1C8E08121EB4FF0048697F /* PBXTextBookmark */ = 6B1C8E08121EB4FF0048697F /* PBXTextBookmark */;
+			6B4214D911803923006C347B /* PBXTextBookmark */ = 6B4214D911803923006C347B /* PBXTextBookmark */;
+			6B847515122B9F4900ADF63D /* PBXTextBookmark */ = 6B847515122B9F4900ADF63D /* PBXTextBookmark */;
+			6B8476F9122D000800ADF63D /* PBXTextBookmark */ = 6B8476F9122D000800ADF63D /* PBXTextBookmark */;
+			6B847779122D223D00ADF63D /* PBXTextBookmark */ = 6B847779122D223D00ADF63D /* PBXTextBookmark */;
+			6B84778B122D279700ADF63D /* PBXTextBookmark */ = 6B84778B122D279700ADF63D /* PBXTextBookmark */;
+			6B8477BB122D297200ADF63D /* PBXTextBookmark */ = 6B8477BB122D297200ADF63D /* PBXTextBookmark */;
+			6B8477E1122D2B9100ADF63D /* PBXTextBookmark */ = 6B8477E1122D2B9100ADF63D /* PBXTextBookmark */;
+			6B8477EE122D2CC900ADF63D /* PBXTextBookmark */ = 6B8477EE122D2CC900ADF63D /* PBXTextBookmark */;
+			6B8477FC122D2E2A00ADF63D /* PBXTextBookmark */ = 6B8477FC122D2E2A00ADF63D /* PBXTextBookmark */;
+			6B8477FE122D2E2A00ADF63D /* PBXTextBookmark */ = 6B8477FE122D2E2A00ADF63D /* PBXTextBookmark */;
+			6B8477FF122D2E2A00ADF63D /* PBXTextBookmark */ = 6B8477FF122D2E2A00ADF63D /* PBXTextBookmark */;
+			6B920A521225C0AC00D5B5AD /* PBXTextBookmark */ = 6B920A521225C0AC00D5B5AD /* PBXTextBookmark */;
+			6B920A6D1225C5DD00D5B5AD /* PBXTextBookmark */ = 6B920A6D1225C5DD00D5B5AD /* PBXTextBookmark */;
+			6B98462E11E6141900FA177B /* PBXTextBookmark */ = 6B98462E11E6141900FA177B /* PBXTextBookmark */;
+			6B98473011E737D800FA177B /* PBXTextBookmark */ = 6B98473011E737D800FA177B /* PBXTextBookmark */;
+			6BA6876E1222F02E00730711 /* PBXTextBookmark */ = 6BA6876E1222F02E00730711 /* PBXTextBookmark */;
+			6BA687881222F4DB00730711 /* PBXTextBookmark */ = 6BA687881222F4DB00730711 /* PBXTextBookmark */;
+			6BA687CA1222FA9300730711 /* PBXTextBookmark */ = 6BA687CA1222FA9300730711 /* PBXTextBookmark */;
+			6BA7F8EC1227002300C8C47A /* PBXTextBookmark */ = 6BA7F8EC1227002300C8C47A /* PBXTextBookmark */;
+			6BA7F8ED1227002300C8C47A /* PBXTextBookmark */ = 6BA7F8ED1227002300C8C47A /* PBXTextBookmark */;
+			6BA7F8EE1227002300C8C47A /* PBXTextBookmark */ = 6BA7F8EE1227002300C8C47A /* PBXTextBookmark */;
+			6BA8CEC01255BCE600272A3B /* PBXTextBookmark */ = 6BA8CEC01255BCE600272A3B /* PBXTextBookmark */;
+			6BA8CECB1255C1A400272A3B /* PBXTextBookmark */ = 6BA8CECB1255C1A400272A3B /* PBXTextBookmark */;
+			6BA8CECD1255C1A400272A3B /* PBXTextBookmark */ = 6BA8CECD1255C1A400272A3B /* PBXTextBookmark */;
+			6BA8CEEF1255C4B700272A3B /* PBXTextBookmark */ = 6BA8CEEF1255C4B700272A3B /* PBXTextBookmark */;
+			6BA8CF4A1255D44700272A3B /* PBXTextBookmark */ = 6BA8CF4A1255D44700272A3B /* PBXTextBookmark */;
+			6BA8CF4D1255D44700272A3B /* PBXTextBookmark */ = 6BA8CF4D1255D44700272A3B /* PBXTextBookmark */;
+			6BA8CF511255D44700272A3B /* PBXTextBookmark */ = 6BA8CF511255D44700272A3B /* PBXTextBookmark */;
+			6BA8CF5B1255D49B00272A3B /* PBXTextBookmark */ = 6BA8CF5B1255D49B00272A3B /* PBXTextBookmark */;
+			6BA8CF951255D97400272A3B /* PBXTextBookmark */ = 6BA8CF951255D97400272A3B /* PBXTextBookmark */;
+			6BA8CFA81255DC6500272A3B /* PBXTextBookmark */ = 6BA8CFA81255DC6500272A3B /* PBXTextBookmark */;
+			6BA8CFBE1255DE0500272A3B /* PBXTextBookmark */ = 6BA8CFBE1255DE0500272A3B /* PBXTextBookmark */;
+			6BA8D10B125B0E8E00272A3B /* PBXTextBookmark */ = 6BA8D10B125B0E8E00272A3B /* PBXTextBookmark */;
+			6BA8D10C125B0E8E00272A3B /* PBXTextBookmark */ = 6BA8D10C125B0E8E00272A3B /* PBXTextBookmark */;
+			6BA8D10D125B0E8E00272A3B /* PBXTextBookmark */ = 6BA8D10D125B0E8E00272A3B /* PBXTextBookmark */;
+			6BAF4321121AF998008CFCDF /* PBXTextBookmark */ = 6BAF4321121AF998008CFCDF /* PBXTextBookmark */;
+			6BAF4421121C25E3008CFCDF /* PBXTextBookmark */ = 6BAF4421121C25E3008CFCDF /* PBXTextBookmark */;
+			6BAF4525121D1723008CFCDF /* PBXTextBookmark */ = 6BAF4525121D1723008CFCDF /* PBXTextBookmark */;
+			6BAF46D3121D8FF1008CFCDF /* PBXTextBookmark */ = 6BAF46D3121D8FF1008CFCDF /* PBXTextBookmark */;
 			6BB2EDF91261C75400E350F8 /* PBXTextBookmark */ = 6BB2EDF91261C75400E350F8 /* PBXTextBookmark */;
-			6BB2EDFB1261C75400E350F8 /* PBXTextBookmark */ = 6BB2EDFB1261C75400E350F8 /* PBXTextBookmark */;
-			6BB2EDFC1261C75400E350F8 /* PBXTextBookmark */ = 6BB2EDFC1261C75400E350F8 /* PBXTextBookmark */;
-			6BB2EDFD1261C75700E350F8 /* PBXTextBookmark */ = 6BB2EDFD1261C75700E350F8 /* PBXTextBookmark */;
-			6BB2EDFE1261C75A00E350F8 /* PBXTextBookmark */ = 6BB2EDFE1261C75A00E350F8 /* PBXTextBookmark */;
-			6BB2EE061261C7B700E350F8 /* PBXTextBookmark */ = 6BB2EE061261C7B700E350F8 /* PBXTextBookmark */;
-			6BB2EE111261C84200E350F8 /* PBXTextBookmark */ = 6BB2EE111261C84200E350F8 /* PBXTextBookmark */;
-			6BB2EE131261C84300E350F8 /* PBXTextBookmark */ = 6BB2EE131261C84300E350F8 /* PBXTextBookmark */;
-			6BB2EE161261C87500E350F8 /* PBXTextBookmark */ = 6BB2EE161261C87500E350F8 /* PBXTextBookmark */;
-			6BB2EE1A1261C88800E350F8 /* PBXTextBookmark */ = 6BB2EE1A1261C88800E350F8 /* PBXTextBookmark */;
-			6BB2EE1E1261C8A100E350F8 /* PBXTextBookmark */ = 6BB2EE1E1261C8A100E350F8 /* PBXTextBookmark */;
-			6BB2EE201261C8BD00E350F8 /* PBXTextBookmark */ = 6BB2EE201261C8BD00E350F8 /* PBXTextBookmark */;
-			6BB2EE231261C92300E350F8 /* PBXTextBookmark */ = 6BB2EE231261C92300E350F8 /* PBXTextBookmark */;
 			6BB2EE241261C92300E350F8 /* PBXTextBookmark */ = 6BB2EE241261C92300E350F8 /* PBXTextBookmark */;
 			6BB2EE251261C92300E350F8 /* PBXTextBookmark */ = 6BB2EE251261C92300E350F8 /* PBXTextBookmark */;
 			6BB2EE261261C92300E350F8 /* PBXTextBookmark */ = 6BB2EE261261C92300E350F8 /* PBXTextBookmark */;
 			6BB2EE271261C92300E350F8 /* PBXTextBookmark */ = 6BB2EE271261C92300E350F8 /* PBXTextBookmark */;
 			6BB2EE281261C92300E350F8 /* PBXTextBookmark */ = 6BB2EE281261C92300E350F8 /* PBXTextBookmark */;
-			6BB2EE291261C92300E350F8 /* PBXTextBookmark */ = 6BB2EE291261C92300E350F8 /* PBXTextBookmark */;
-			6BB2EE2A1261C92300E350F8 /* PBXTextBookmark */ = 6BB2EE2A1261C92300E350F8 /* PBXTextBookmark */;
 			6BB2EE351261CEB800E350F8 /* PBXTextBookmark */ = 6BB2EE351261CEB800E350F8 /* PBXTextBookmark */;
 			6BB2EE361261CEB800E350F8 /* PBXTextBookmark */ = 6BB2EE361261CEB800E350F8 /* PBXTextBookmark */;
-			6BB2EE371261CEB800E350F8 /* PBXTextBookmark */ = 6BB2EE371261CEB800E350F8 /* PBXTextBookmark */;
-			6BB2EE381261CEB800E350F8 /* PBXTextBookmark */ = 6BB2EE381261CEB800E350F8 /* PBXTextBookmark */;
-			6BB2EE391261CEB800E350F8 /* PBXTextBookmark */ = 6BB2EE391261CEB800E350F8 /* PBXTextBookmark */;
-			6BB2EE3A1261CEB800E350F8 /* PBXTextBookmark */ = 6BB2EE3A1261CEB800E350F8 /* PBXTextBookmark */;
-			6BB2EE3E1261D02000E350F8 /* PBXTextBookmark */ = 6BB2EE3E1261D02000E350F8 /* PBXTextBookmark */;
 			6BB2EE3F1261D02000E350F8 /* PBXTextBookmark */ = 6BB2EE3F1261D02000E350F8 /* PBXTextBookmark */;
-			6BB2EE401261D02000E350F8 /* PBXTextBookmark */ = 6BB2EE401261D02000E350F8 /* PBXTextBookmark */;
-			6BB2EE411261D02000E350F8 /* PBXTextBookmark */ = 6BB2EE411261D02000E350F8 /* PBXTextBookmark */;
 			6BB2EE641261D48100E350F8 /* PBXTextBookmark */ = 6BB2EE641261D48100E350F8 /* PBXTextBookmark */;
 			6BB2EE651261D48100E350F8 /* PBXTextBookmark */ = 6BB2EE651261D48100E350F8 /* PBXTextBookmark */;
 			6BB2EE661261D48100E350F8 /* PBXTextBookmark */ = 6BB2EE661261D48100E350F8 /* PBXTextBookmark */;
 			6BB2EE671261D48100E350F8 /* PBXTextBookmark */ = 6BB2EE671261D48100E350F8 /* PBXTextBookmark */;
 			6BB2EE681261D48100E350F8 /* PBXTextBookmark */ = 6BB2EE681261D48100E350F8 /* PBXTextBookmark */;
 			6BB2EE691261D48100E350F8 /* PBXTextBookmark */ = 6BB2EE691261D48100E350F8 /* PBXTextBookmark */;
-			6BB2EE6A1261D48100E350F8 /* PBXTextBookmark */ = 6BB2EE6A1261D48100E350F8 /* PBXTextBookmark */;
-			6BB2EE6B1261D48100E350F8 /* PBXTextBookmark */ = 6BB2EE6B1261D48100E350F8 /* PBXTextBookmark */;
-			6BB2EE6D1261D4A400E350F8 /* PBXTextBookmark */ = 6BB2EE6D1261D4A400E350F8 /* PBXTextBookmark */;
-			6BBB0361124E242E00533229 = 6BBB0361124E242E00533229 /* PBXTextBookmark */;
-			6BBB0363124E242E00533229 = 6BBB0363124E242E00533229 /* PBXTextBookmark */;
-			6BBB0365124E242E00533229 = 6BBB0365124E242E00533229 /* PBXTextBookmark */;
-			6BBB0366124E242E00533229 = 6BBB0366124E242E00533229 /* PBXTextBookmark */;
-			6BBB4AA5115B4F3400CF791D = 6BBB4AA5115B4F3400CF791D /* PBXTextBookmark */;
-			6BBB4C34115B7A3D00CF791D = 6BBB4C34115B7A3D00CF791D /* PBXTextBookmark */;
-			6BD402111224336600995864 = 6BD402111224336600995864 /* PBXTextBookmark */;
-			6BD402121224336600995864 = 6BD402121224336600995864 /* PBXTextBookmark */;
-			6BD402611224387200995864 = 6BD402611224387200995864 /* PBXTextBookmark */;
-			6BD402621224387200995864 = 6BD402621224387200995864 /* PBXTextBookmark */;
-			6BD402811224393000995864 = 6BD402811224393000995864 /* PBXTextBookmark */;
-			6BD4028C1224399300995864 = 6BD4028C1224399300995864 /* PBXTextBookmark */;
-			6BD4029B12243A8000995864 = 6BD4029B12243A8000995864 /* PBXTextBookmark */;
-			6BD402B4122441CB00995864 = 6BD402B4122441CB00995864 /* PBXTextBookmark */;
-			6BD667FF123D2D230021A7A4 = 6BD667FF123D2D230021A7A4 /* PBXTextBookmark */;
-			6BD6681812434B790021A7A4 = 6BD6681812434B790021A7A4 /* PBXTextBookmark */;
-			6BD6684E124350B80021A7A4 = 6BD6684E124350B80021A7A4 /* PBXTextBookmark */;
-			6BD66855124350F80021A7A4 = 6BD66855124350F80021A7A4 /* PBXTextBookmark */;
-			6BD6685F124351D70021A7A4 = 6BD6685F124351D70021A7A4 /* PBXTextBookmark */;
-			6BD6686E124356CE0021A7A4 = 6BD6686E124356CE0021A7A4 /* PBXTextBookmark */;
-			6BD668A3124361EB0021A7A4 = 6BD668A3124361EB0021A7A4 /* PBXTextBookmark */;
-			6BD6691112436CEC0021A7A4 = 6BD6691112436CEC0021A7A4 /* PBXTextBookmark */;
-			6BD6691212436CEC0021A7A4 = 6BD6691212436CEC0021A7A4 /* PBXTextBookmark */;
-			6BD66930124374D60021A7A4 = 6BD66930124374D60021A7A4 /* PBXTextBookmark */;
-			6BD66934124375DF0021A7A4 = 6BD66934124375DF0021A7A4 /* PBXTextBookmark */;
-			6BD66937124376780021A7A4 = 6BD66937124376780021A7A4 /* PBXTextBookmark */;
-			6BD66938124376780021A7A4 = 6BD66938124376780021A7A4 /* PBXTextBookmark */;
-			6BD669501243778E0021A7A4 = 6BD669501243778E0021A7A4 /* PBXTextBookmark */;
-			6BD669511243778E0021A7A4 = 6BD669511243778E0021A7A4 /* PBXTextBookmark */;
-			6BD6695C124377D40021A7A4 = 6BD6695C124377D40021A7A4 /* PBXTextBookmark */;
-			6BD669661243806F0021A7A4 = 6BD669661243806F0021A7A4 /* PBXTextBookmark */;
-			6BF5F27311747CFA000502A6 = 6BF5F27311747CFA000502A6 /* PBXTextBookmark */;
-			6BF5F2E411748884000502A6 = 6BF5F2E411748884000502A6 /* PBXTextBookmark */;
-			6BF5F2E511748884000502A6 = 6BF5F2E511748884000502A6 /* PBXTextBookmark */;
-			6BF5F2E611748884000502A6 = 6BF5F2E611748884000502A6 /* PBXTextBookmark */;
-			6BF5F2E711748884000502A6 = 6BF5F2E711748884000502A6 /* PBXTextBookmark */;
+			6BB2EE711261DA0400E350F8 /* PBXTextBookmark */ = 6BB2EE711261DA0400E350F8 /* PBXTextBookmark */;
+			6BB2EE721261DA0400E350F8 /* PBXTextBookmark */ = 6BB2EE721261DA0400E350F8 /* PBXTextBookmark */;
+			6BB2EE731261DA0400E350F8 /* PBXTextBookmark */ = 6BB2EE731261DA0400E350F8 /* PBXTextBookmark */;
+			6BB2EE7A1264CD7900E350F8 /* PBXTextBookmark */ = 6BB2EE7A1264CD7900E350F8 /* PBXTextBookmark */;
+			6BB2EE7B1264CD7900E350F8 /* PBXTextBookmark */ = 6BB2EE7B1264CD7900E350F8 /* PBXTextBookmark */;
+			6BB2EE7C1264CD7900E350F8 /* PBXTextBookmark */ = 6BB2EE7C1264CD7900E350F8 /* PBXTextBookmark */;
+			6BB2EE7D1264CD7900E350F8 /* PBXTextBookmark */ = 6BB2EE7D1264CD7900E350F8 /* PBXTextBookmark */;
+			6BBB0361124E242E00533229 /* PBXTextBookmark */ = 6BBB0361124E242E00533229 /* PBXTextBookmark */;
+			6BBB0363124E242E00533229 /* PBXTextBookmark */ = 6BBB0363124E242E00533229 /* PBXTextBookmark */;
+			6BBB0366124E242E00533229 /* PBXTextBookmark */ = 6BBB0366124E242E00533229 /* PBXTextBookmark */;
+			6BBB4AA5115B4F3400CF791D /* PBXTextBookmark */ = 6BBB4AA5115B4F3400CF791D /* PBXTextBookmark */;
+			6BBB4C34115B7A3D00CF791D /* PBXTextBookmark */ = 6BBB4C34115B7A3D00CF791D /* PBXTextBookmark */;
+			6BD402111224336600995864 /* PBXTextBookmark */ = 6BD402111224336600995864 /* PBXTextBookmark */;
+			6BD402121224336600995864 /* PBXTextBookmark */ = 6BD402121224336600995864 /* PBXTextBookmark */;
+			6BD402611224387200995864 /* PBXTextBookmark */ = 6BD402611224387200995864 /* PBXTextBookmark */;
+			6BD402621224387200995864 /* PBXTextBookmark */ = 6BD402621224387200995864 /* PBXTextBookmark */;
+			6BD402811224393000995864 /* PBXTextBookmark */ = 6BD402811224393000995864 /* PBXTextBookmark */;
+			6BD4028C1224399300995864 /* PBXTextBookmark */ = 6BD4028C1224399300995864 /* PBXTextBookmark */;
+			6BD4029B12243A8000995864 /* PBXTextBookmark */ = 6BD4029B12243A8000995864 /* PBXTextBookmark */;
+			6BD402B4122441CB00995864 /* PBXTextBookmark */ = 6BD402B4122441CB00995864 /* PBXTextBookmark */;
+			6BD667FF123D2D230021A7A4 /* PBXTextBookmark */ = 6BD667FF123D2D230021A7A4 /* PBXTextBookmark */;
+			6BD6681812434B790021A7A4 /* PBXTextBookmark */ = 6BD6681812434B790021A7A4 /* PBXTextBookmark */;
+			6BD66855124350F80021A7A4 /* PBXTextBookmark */ = 6BD66855124350F80021A7A4 /* PBXTextBookmark */;
+			6BD668A3124361EB0021A7A4 /* PBXTextBookmark */ = 6BD668A3124361EB0021A7A4 /* PBXTextBookmark */;
+			6BD6691112436CEC0021A7A4 /* PBXTextBookmark */ = 6BD6691112436CEC0021A7A4 /* PBXTextBookmark */;
+			6BD66930124374D60021A7A4 /* PBXTextBookmark */ = 6BD66930124374D60021A7A4 /* PBXTextBookmark */;
+			6BD66937124376780021A7A4 /* PBXTextBookmark */ = 6BD66937124376780021A7A4 /* PBXTextBookmark */;
+			6BD66938124376780021A7A4 /* PBXTextBookmark */ = 6BD66938124376780021A7A4 /* PBXTextBookmark */;
+			6BD669501243778E0021A7A4 /* PBXTextBookmark */ = 6BD669501243778E0021A7A4 /* PBXTextBookmark */;
+			6BD669511243778E0021A7A4 /* PBXTextBookmark */ = 6BD669511243778E0021A7A4 /* PBXTextBookmark */;
+			6BD6695C124377D40021A7A4 /* PBXTextBookmark */ = 6BD6695C124377D40021A7A4 /* PBXTextBookmark */;
+			6BF5F27311747CFA000502A6 /* PBXTextBookmark */ = 6BF5F27311747CFA000502A6 /* PBXTextBookmark */;
+			6BF5F2E411748884000502A6 /* PBXTextBookmark */ = 6BF5F2E411748884000502A6 /* PBXTextBookmark */;
+			6BF5F2E511748884000502A6 /* PBXTextBookmark */ = 6BF5F2E511748884000502A6 /* PBXTextBookmark */;
+			6BF5F2E611748884000502A6 /* PBXTextBookmark */ = 6BF5F2E611748884000502A6 /* PBXTextBookmark */;
+			6BF5F2E711748884000502A6 /* PBXTextBookmark */ = 6BF5F2E711748884000502A6 /* PBXTextBookmark */;
 		};
 		sourceControlManager = 6B8632A90F78115100E2684A /* Source Control */;
 		userBookmarkGroup = 6B8DE6F010A88F0500DF20FB /* PBXBookmarkGroup */;
@@ -313,9 +270,9 @@
 	};
 	6B1185FC10068B040018F96F /* DetourCommon.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {933, 3627}}";
+			sepNavIntBoundsRect = "{{0, 0}, {931, 3094}}";
 			sepNavSelRange = "{706, 0}";
-			sepNavVisRange = "{0, 1721}";
+			sepNavVisRange = "{0, 1802}";
 		};
 	};
 	6B1185FD10068B150018F96F /* DetourCommon.cpp */ = {
@@ -462,9 +419,9 @@
 	};
 	6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 15392}}";
-			sepNavSelRange = "{24602, 0}";
-			sepNavVisRange = "{23873, 1419}";
+			sepNavIntBoundsRect = "{{0, 0}, {931, 15834}}";
+			sepNavSelRange = "{7100, 0}";
+			sepNavVisRange = "{6452, 779}";
 			sepNavWindowFrame = "{{38, 30}, {1214, 722}}";
 		};
 	};
@@ -647,16 +604,6 @@
 		vrLen = 918;
 		vrLoc = 2075;
 	};
-	6B8477FD122D2E2A00ADF63D /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B555DB0100B212E00247EA3 /* imguiRenderGL.cpp */;
-		name = "imguiRenderGL.cpp: 432";
-		rLen = 17;
-		rLoc = 9863;
-		rType = 0;
-		vrLen = 1033;
-		vrLoc = 9358;
-	};
 	6B8477FE122D2E2A00ADF63D /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 6B847776122D221C00ADF63D /* ValueHistory.cpp */;
@@ -824,16 +771,6 @@
 		vrLen = 2149;
 		vrLoc = 207;
 	};
-	6B920AA81225DBCB00D5B5AD /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B137C890F7FCC1100459200 /* RecastRegion.cpp */;
-		name = "RecastRegion.cpp: 931";
-		rLen = 0;
-		rLoc = 23477;
-		rType = 0;
-		vrLen = 751;
-		vrLoc = 21660;
-	};
 	6B98462E11E6141900FA177B /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 6B137C7B0F7FCBE400459200 /* MeshLoaderObj.h */;
@@ -942,16 +879,6 @@
 		path = /Users/memon/Code/recastnavigation/Recast/Include/.svn/entries;
 		sourceTree = "<absolute>";
 	};
-	6BA687831222F42100730711 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B98470511E733B600FA177B /* RecastAlloc.h */;
-		name = "RecastAlloc.h: 55";
-		rLen = 0;
-		rLoc = 2032;
-		rType = 0;
-		vrLen = 951;
-		vrLoc = 1347;
-	};
 	6BA687881222F4DB00730711 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 6B9847B711E7519A00FA177B /* RecastAlloc.cpp */;
@@ -990,26 +917,6 @@
 		vrLen = 797;
 		vrLoc = 4335;
 	};
-	6BA7F8AC1226EF0400C8C47A /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */;
-		name = "Sample_TileMesh.cpp: 929";
-		rLen = 0;
-		rLoc = 25487;
-		rType = 0;
-		vrLen = 649;
-		vrLoc = 25185;
-	};
-	6BA7F8D01226EF9D00C8C47A /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B137C830F7FCC1100459200 /* RecastContour.cpp */;
-		name = "RecastContour.cpp: 752";
-		rLen = 0;
-		rLoc = 20095;
-		rType = 0;
-		vrLen = 431;
-		vrLoc = 19784;
-	};
 	6BA7F8EC1227002300C8C47A /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 6BAF427A121ADCC2008CFCDF /* DetourAssert.h */;
@@ -1114,16 +1021,6 @@
 		vrLen = 704;
 		vrLoc = 5564;
 	};
-	6BA8CF501255D44700272A3B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B98463211E6144400FA177B /* Sample_SoloMeshTiled.cpp */;
-		name = "Sample_SoloMeshTiled.cpp: 386";
-		rLen = 0;
-		rLoc = 11617;
-		rType = 0;
-		vrLen = 1076;
-		vrLoc = 11096;
-	};
 	6BA8CF511255D44700272A3B /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 6B98463111E6144400FA177B /* Sample_SoloMeshTiled.h */;
@@ -1162,46 +1059,6 @@
 		originalNumberOfMultipleMatches = 1;
 		state = 1;
 	};
-	6BA8CF6F1255D50700272A3B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6140FFA62BE004F1BC4 /* Sample.cpp */;
-		name = "Sample.cpp: 46";
-		rLen = 0;
-		rLoc = 1462;
-		rType = 0;
-		vrLen = 327;
-		vrLoc = 1228;
-	};
-	6BA8CF7B1255D5FE00272A3B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BA1E88810C7BFC9008007F6 /* Sample_SoloMeshSimple.cpp */;
-		name = "Sample_SoloMeshSimple.cpp: 250";
-		rLen = 18;
-		rLoc = 8071;
-		rType = 0;
-		vrLen = 755;
-		vrLoc = 7472;
-	};
-	6BA8CF7C1255D5FE00272A3B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6100FFA62AD004F1BC4 /* Sample.h */;
-		name = "Sample.h: 128";
-		rLen = 19;
-		rLoc = 3880;
-		rType = 0;
-		vrLen = 748;
-		vrLoc = 3295;
-	};
-	6BA8CF941255D97400272A3B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB7FC0A10EBB6AA006DA0A6 /* NavMeshTesterTool.cpp */;
-		name = "NavMeshTesterTool.cpp: 170";
-		rLen = 0;
-		rLoc = 4635;
-		rType = 0;
-		vrLen = 658;
-		vrLoc = 4600;
-	};
 	6BA8CF951255D97400272A3B /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 6BCF32351104CD05009445BF /* OffMeshConnectionTool.cpp */;
@@ -1277,38 +1134,18 @@
 			sepNavWindowFrame = "{{15, 51}, {1214, 722}}";
 		};
 	};
-	6BAF3E781212869F008CFCDF /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7A10CFE1D500F74F2B /* DebugDraw.cpp */;
-		name = "DebugDraw.cpp: 118";
-		rLen = 15;
-		rLoc = 3552;
-		rType = 0;
-		vrLen = 860;
-		vrLoc = 3128;
-	};
-	6BAF404F12140B4E008CFCDF /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7710CFE1D500F74F2B /* DebugDraw.h */;
-		name = "DebugDraw.h: 95";
-		rLen = 0;
-		rLoc = 3176;
-		rType = 0;
-		vrLen = 831;
-		vrLoc = 2674;
-	};
 	6BAF40D912196A25008CFCDF /* DetourNavMeshQuery.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {933, 5317}}";
-			sepNavSelRange = "{6787, 0}";
-			sepNavVisRange = "{5974, 1646}";
+			sepNavIntBoundsRect = "{{0, 0}, {931, 5083}}";
+			sepNavSelRange = "{14684, 0}";
+			sepNavVisRange = "{13703, 2034}";
 		};
 	};
 	6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {933, 31668}}";
-			sepNavSelRange = "{26272, 0}";
-			sepNavVisRange = "{26033, 642}";
+			sepNavIntBoundsRect = "{{0, 0}, {931, 31863}}";
+			sepNavSelRange = "{60149, 0}";
+			sepNavVisRange = "{59549, 901}";
 		};
 	};
 	6BAF427A121ADCC2008CFCDF /* DetourAssert.h */ = {
@@ -1386,92 +1223,6 @@
 		path = /Developer/SDKs/MacOSX10.5.sdk/usr/include/mach/mach_time.h;
 		sourceTree = "<absolute>";
 	};
-	6BB2EDD5125FC12900E350F8 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 503";
-		rLen = 22;
-		rLoc = 11876;
-		rType = 0;
-		vrLen = 1022;
-		vrLoc = 11175;
-	};
-	6BB2EDD6125FC12900E350F8 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB2EDD7125FC12900E350F8 /* MarchingCubes.cpp */;
-		rLen = 0;
-		rLoc = 9223372036854775808;
-		rType = 0;
-	};
-	6BB2EDD7125FC12900E350F8 /* MarchingCubes.cpp */ = {
-		isa = PBXFileReference;
-		lastKnownFileType = sourcecode.cpp.cpp;
-		name = MarchingCubes.cpp;
-		path = /Users/memon/Downloads/MarchingCubes.cpp;
-		sourceTree = "<absolute>";
-	};
-	6BB2EDD8125FC12900E350F8 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB2EDD9125FC12900E350F8 /* MarchingCubes.cpp */;
-		name = "MarchingCubes.cpp: 15";
-		rLen = 0;
-		rLoc = 463;
-		rType = 0;
-		vrLen = 920;
-		vrLoc = 36615;
-	};
-	6BB2EDD9125FC12900E350F8 /* MarchingCubes.cpp */ = {
-		isa = PBXFileReference;
-		lastKnownFileType = sourcecode.cpp.cpp;
-		name = MarchingCubes.cpp;
-		path = /Users/memon/Downloads/MarchingCubes.cpp;
-		sourceTree = "<absolute>";
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 11804}}";
-			sepNavSelRange = "{37372, 0}";
-			sepNavVisRange = "{36538, 997}";
-		};
-	};
-	6BB2EDEC1261C59300E350F8 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB2EDD9125FC12900E350F8 /* MarchingCubes.cpp */;
-		name = "MarchingCubes.cpp: 15";
-		rLen = 0;
-		rLoc = 463;
-		rType = 0;
-		vrLen = 997;
-		vrLoc = 36538;
-	};
-	6BB2EDF61261C75400E350F8 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
-		name = "CrowdManager.cpp: 493";
-		rLen = 0;
-		rLoc = 11581;
-		rType = 0;
-		vrLen = 555;
-		vrLoc = 11178;
-	};
-	6BB2EDF71261C75400E350F8 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B137C820F7FCC1100459200 /* Recast.cpp */;
-		name = "Recast.cpp: 203";
-		rLen = 3;
-		rLoc = 5061;
-		rType = 0;
-		vrLen = 717;
-		vrLoc = 4703;
-	};
-	6BB2EDF81261C75400E350F8 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7A10CFE1D500F74F2B /* DebugDraw.cpp */;
-		name = "DebugDraw.cpp: 172";
-		rLen = 3;
-		rLoc = 4942;
-		rType = 0;
-		vrLen = 491;
-		vrLoc = 4717;
-	};
 	6BB2EDF91261C75400E350F8 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 6BB2EDFA1261C75400E350F8 /* math.h */;
@@ -1488,126 +1239,6 @@
 		path = /Developer/SDKs/MacOSX10.5.sdk/usr/include/architecture/i386/math.h;
 		sourceTree = "<absolute>";
 	};
-	6BB2EDFB1261C75400E350F8 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */;
-		name = "main.cpp: 897";
-		rLen = 3;
-		rLoc = 20913;
-		rType = 0;
-		vrLen = 580;
-		vrLoc = 20576;
-	};
-	6BB2EDFC1261C75400E350F8 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */;
-		name = "main.cpp: 66";
-		rLen = 0;
-		rLoc = 1985;
-		rType = 0;
-		vrLen = 821;
-		vrLoc = 1640;
-	};
-	6BB2EDFD1261C75700E350F8 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */;
-		name = "main.cpp: 66";
-		rLen = 0;
-		rLoc = 1985;
-		rType = 0;
-		vrLen = 406;
-		vrLoc = 1771;
-	};
-	6BB2EDFE1261C75A00E350F8 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */;
-		name = "main.cpp: 66";
-		rLen = 0;
-		rLoc = 1985;
-		rType = 0;
-		vrLen = 821;
-		vrLoc = 1640;
-	};
-	6BB2EE061261C7B700E350F8 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */;
-		name = "main.cpp: 65";
-		rLen = 0;
-		rLoc = 1985;
-		rType = 0;
-		vrLen = 852;
-		vrLoc = 1640;
-	};
-	6BB2EE111261C84200E350F8 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */;
-		name = "main.cpp: 67";
-		rLen = 0;
-		rLoc = 1985;
-		rType = 0;
-		vrLen = 770;
-		vrLoc = 1640;
-	};
-	6BB2EE131261C84300E350F8 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */;
-		name = "main.cpp: 67";
-		rLen = 0;
-		rLoc = 1985;
-		rType = 0;
-		vrLen = 857;
-		vrLoc = 1640;
-	};
-	6BB2EE161261C87500E350F8 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */;
-		name = "main.cpp: 67";
-		rLen = 0;
-		rLoc = 1985;
-		rType = 0;
-		vrLen = 788;
-		vrLoc = 1585;
-	};
-	6BB2EE1A1261C88800E350F8 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */;
-		name = "main.cpp: 67";
-		rLen = 0;
-		rLoc = 1985;
-		rType = 0;
-		vrLen = 815;
-		vrLoc = 1694;
-	};
-	6BB2EE1E1261C8A100E350F8 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */;
-		name = "main.cpp: 67";
-		rLen = 0;
-		rLoc = 1985;
-		rType = 0;
-		vrLen = 785;
-		vrLoc = 1449;
-	};
-	6BB2EE201261C8BD00E350F8 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */;
-		name = "main.cpp: 65";
-		rLen = 0;
-		rLoc = 1985;
-		rType = 0;
-		vrLen = 436;
-		vrLoc = 1771;
-	};
-	6BB2EE231261C92300E350F8 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B137C7E0F7FCBFE00459200 /* Recast.h */;
-		name = "Recast.h: 22";
-		rLen = 84;
-		rLoc = 960;
-		rType = 0;
-		vrLen = 923;
-		vrLoc = 521;
-	};
 	6BB2EE241261C92300E350F8 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 6BB93C7710CFE1D500F74F2B /* DebugDraw.h */;
@@ -1658,23 +1289,6 @@
 		vrLen = 601;
 		vrLoc = 20575;
 	};
-	6BB2EE291261C92300E350F8 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B555DB0100B212E00247EA3 /* imguiRenderGL.cpp */;
-		rLen = 2;
-		rLoc = 5720;
-		rType = 0;
-	};
-	6BB2EE2A1261C92300E350F8 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B555DB0100B212E00247EA3 /* imguiRenderGL.cpp */;
-		name = "imguiRenderGL.cpp: 27";
-		rLen = 0;
-		rLoc = 1110;
-		rType = 0;
-		vrLen = 626;
-		vrLoc = 789;
-	};
 	6BB2EE351261CEB800E350F8 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 6B555DB0100B212E00247EA3 /* imguiRenderGL.cpp */;
@@ -1695,56 +1309,6 @@
 		vrLen = 1378;
 		vrLoc = 969;
 	};
-	6BB2EE371261CEB800E350F8 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B137C890F7FCC1100459200 /* RecastRegion.cpp */;
-		name = "RecastRegion.cpp: 849";
-		rLen = 0;
-		rLoc = 19716;
-		rType = 0;
-		vrLen = 1078;
-		vrLoc = 19104;
-	};
-	6BB2EE381261CEB800E350F8 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BA1E88810C7BFC9008007F6 /* Sample_SoloMeshSimple.cpp */;
-		name = "Sample_SoloMeshSimple.cpp: 380";
-		rLen = 0;
-		rLoc = 11598;
-		rType = 0;
-		vrLen = 1806;
-		vrLoc = 10675;
-	};
-	6BB2EE391261CEB800E350F8 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6140FFA62BE004F1BC4 /* Sample.cpp */;
-		name = "Sample.cpp: 121";
-		rLen = 15;
-		rLoc = 2865;
-		rType = 0;
-		vrLen = 1409;
-		vrLoc = 3254;
-	};
-	6BB2EE3A1261CEB800E350F8 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6140FFA62BE004F1BC4 /* Sample.cpp */;
-		name = "Sample.cpp: 121";
-		rLen = 0;
-		rLoc = 2884;
-		rType = 0;
-		vrLen = 1152;
-		vrLoc = 2586;
-	};
-	6BB2EE3E1261D02000E350F8 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6140FFA62BE004F1BC4 /* Sample.cpp */;
-		name = "Sample.cpp: 121";
-		rLen = 0;
-		rLoc = 2884;
-		rType = 0;
-		vrLen = 1223;
-		vrLoc = 2623;
-	};
 	6BB2EE3F1261D02000E350F8 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 6B137C830F7FCC1100459200 /* RecastContour.cpp */;
@@ -1755,26 +1319,6 @@
 		vrLen = 1374;
 		vrLoc = 19389;
 	};
-	6BB2EE401261D02000E350F8 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B137C890F7FCC1100459200 /* RecastRegion.cpp */;
-		name = "RecastRegion.cpp: 849";
-		rLen = 0;
-		rLoc = 19716;
-		rType = 0;
-		vrLen = 1093;
-		vrLoc = 19103;
-	};
-	6BB2EE411261D02000E350F8 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B137C890F7FCC1100459200 /* RecastRegion.cpp */;
-		name = "RecastRegion.cpp: 830";
-		rLen = 0;
-		rLoc = 19686;
-		rType = 0;
-		vrLen = 971;
-		vrLoc = 17831;
-	};
 	6BB2EE641261D48100E350F8 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 6B137C7E0F7FCBFE00459200 /* Recast.h */;
@@ -1835,35 +1379,75 @@
 		vrLen = 1315;
 		vrLoc = 10928;
 	};
-	6BB2EE6A1261D48100E350F8 /* PBXTextBookmark */ = {
+	6BB2EE711261DA0400E350F8 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */;
-		name = "Sample_TileMesh.cpp: 903";
+		fRef = 6B1185FC10068B040018F96F /* DetourCommon.h */;
+		name = "DetourCommon.h: 13";
 		rLen = 0;
-		rLoc = 24421;
+		rLoc = 706;
 		rType = 0;
-		vrLen = 1348;
-		vrLoc = 23835;
+		vrLen = 1802;
+		vrLoc = 0;
 	};
-	6BB2EE6B1261D48100E350F8 /* PBXTextBookmark */ = {
+	6BB2EE721261DA0400E350F8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */;
+		name = "DetourNavMeshQuery.cpp: 2218";
+		rLen = 0;
+		rLoc = 60149;
+		rType = 0;
+		vrLen = 901;
+		vrLoc = 59549;
+	};
+	6BB2EE731261DA0400E350F8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6BAF40D912196A25008CFCDF /* DetourNavMeshQuery.h */;
+		name = "DetourNavMeshQuery.h: 305";
+		rLen = 0;
+		rLoc = 14684;
+		rType = 0;
+		vrLen = 2034;
+		vrLoc = 13703;
+	};
+	6BB2EE7A1264CD7900E350F8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6BD667D9123D28100021A7A4 /* CrowdManager.cpp */;
+		name = "CrowdManager.cpp: 493";
+		rLen = 0;
+		rLoc = 11581;
+		rType = 0;
+		vrLen = 1249;
+		vrLoc = 11428;
+	};
+	6BB2EE7B1264CD7900E350F8 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6BB7FC0A10EBB6AA006DA0A6 /* NavMeshTesterTool.cpp */;
+		name = "NavMeshTesterTool.cpp: 1120";
+		rLen = 0;
+		rLoc = 32256;
+		rType = 0;
+		vrLen = 1234;
+		vrLoc = 31761;
+	};
+	6BB2EE7C1264CD7900E350F8 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */;
-		name = "Sample_TileMesh.cpp: 903";
+		name = "Sample_TileMesh.cpp: 916";
 		rLen = 0;
-		rLoc = 24453;
+		rLoc = 25065;
 		rType = 0;
-		vrLen = 1363;
+		vrLen = 1706;
 		vrLoc = 23873;
 	};
-	6BB2EE6D1261D4A400E350F8 /* PBXTextBookmark */ = {
+	6BB2EE7D1264CD7900E350F8 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */;
-		name = "Sample_TileMesh.cpp: 906";
+		name = "Sample_TileMesh.cpp: 315";
 		rLen = 0;
-		rLoc = 24602;
+		rLoc = 7100;
 		rType = 0;
-		vrLen = 1419;
-		vrLoc = 23873;
+		vrLen = 779;
+		vrLoc = 6452;
 	};
 	6BB788160FC0472B003C24DB /* ChunkyTriMesh.cpp */ = {
 		uiCtxt = {
@@ -1888,9 +1472,9 @@
 	};
 	6BB7FC0A10EBB6AA006DA0A6 /* NavMeshTesterTool.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {933, 15899}}";
-			sepNavSelRange = "{4635, 0}";
-			sepNavVisRange = "{4600, 658}";
+			sepNavIntBoundsRect = "{{0, 0}, {931, 15678}}";
+			sepNavSelRange = "{32256, 0}";
+			sepNavVisRange = "{31761, 1234}";
 			sepNavWindowFrame = "{{38, 30}, {1214, 722}}";
 		};
 	};
@@ -2000,16 +1584,6 @@
 		path = "/Users/memon/Oldies/Public/Drop Box/sx/ZenBound_iPhone/GameModel.cpp";
 		sourceTree = "<absolute>";
 	};
-	6BBB0365124E242E00533229 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */;
-		name = "DetourNavMeshQuery.cpp: 961";
-		rLen = 0;
-		rLoc = 26272;
-		rType = 0;
-		vrLen = 642;
-		vrLoc = 26033;
-	};
 	6BBB0366124E242E00533229 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 6B8DE88B10B69E4C00DF20FB /* DetourNavMesh.h */;
@@ -2208,9 +1782,9 @@
 	};
 	6BD667D9123D28100021A7A4 /* CrowdManager.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {931, 16237}}";
+			sepNavIntBoundsRect = "{{0, 0}, {931, 16601}}";
 			sepNavSelRange = "{11581, 0}";
-			sepNavVisRange = "{11178, 555}";
+			sepNavVisRange = "{11428, 1249}";
 		};
 	};
 	6BD667FF123D2D230021A7A4 /* PBXTextBookmark */ = {
@@ -2233,16 +1807,6 @@
 		vrLen = 739;
 		vrLoc = 6676;
 	};
-	6BD6684E124350B80021A7A4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */;
-		name = "main.cpp: 64";
-		rLen = 0;
-		rLoc = 1985;
-		rType = 0;
-		vrLen = 784;
-		vrLoc = 1728;
-	};
 	6BD66851124350F50021A7A4 /* NavMeshTesterTool.cpp:480 */ = {
 		isa = PBXFileBreakpoint;
 		actions = (
@@ -2271,26 +1835,6 @@
 		vrLen = 1294;
 		vrLoc = 133;
 	};
-	6BD6685F124351D70021A7A4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BAF40D912196A25008CFCDF /* DetourNavMeshQuery.h */;
-		name = "DetourNavMeshQuery.h: 152";
-		rLen = 0;
-		rLoc = 6787;
-		rType = 0;
-		vrLen = 1646;
-		vrLoc = 5974;
-	};
-	6BD6686E124356CE0021A7A4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B137C820F7FCC1100459200 /* Recast.cpp */;
-		name = "Recast.cpp: 173";
-		rLen = 1;
-		rLoc = 4212;
-		rType = 0;
-		vrLen = 958;
-		vrLoc = 3742;
-	};
 	6BD668A3124361EB0021A7A4 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 6BAF4441121C3D26008CFCDF /* SampleInterfaces.cpp */;
@@ -2311,16 +1855,6 @@
 		vrLen = 801;
 		vrLoc = 1793;
 	};
-	6BD6691212436CEC0021A7A4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B1185FC10068B040018F96F /* DetourCommon.h */;
-		name = "DetourCommon.h: 13";
-		rLen = 0;
-		rLoc = 706;
-		rType = 0;
-		vrLen = 1721;
-		vrLoc = 0;
-	};
 	6BD66930124374D60021A7A4 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 6BAF4561121D173A008CFCDF /* RecastAssert.h */;
@@ -2331,16 +1865,6 @@
 		vrLen = 1368;
 		vrLoc = 0;
 	};
-	6BD66934124375DF0021A7A4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6B137C7E0F7FCBFE00459200 /* Recast.h */;
-		name = "Recast.h: 256";
-		rLen = 0;
-		rLoc = 9767;
-		rType = 0;
-		vrLen = 1723;
-		vrLoc = 8968;
-	};
 	6BD66937124376780021A7A4 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 6B624169103434880002E346 /* RecastMeshDetail.cpp */;
@@ -2391,16 +1915,6 @@
 		vrLen = 965;
 		vrLoc = 30236;
 	};
-	6BD669661243806F0021A7A4 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6BB93C7C10CFE1D500F74F2B /* RecastDebugDraw.cpp */;
-		name = "RecastDebugDraw.cpp: 662";
-		rLen = 0;
-		rLoc = 16422;
-		rType = 0;
-		vrLen = 748;
-		vrLoc = 16296;
-	};
 	6BF5F23911747606000502A6 /* Filelist.cpp */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {909, 1600}}";
diff --git a/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.perspectivev3 b/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.perspectivev3
index 6c79474..b38bb3d 100644
--- a/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.perspectivev3
+++ b/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.perspectivev3
@@ -291,7 +291,7 @@
 								</array>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-							<string>{{0, 422}, {264, 660}}</string>
+							<string>{{0, 568}, {264, 660}}</string>
 						</dict>
 						<key>PBXTopSmartGroupGIDs</key>
 						<array/>
@@ -338,7 +338,7 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>6BB2EE6D1261D4A400E350F8</string>
+										<string>6BB2EE7D1264CD7900E350F8</string>
 										<key>history</key>
 										<array>
 											<string>6BBB4AA5115B4F3400CF791D</string>
@@ -385,10 +385,8 @@
 											<string>6BD667FF123D2D230021A7A4</string>
 											<string>6BD6681812434B790021A7A4</string>
 											<string>6BD66855124350F80021A7A4</string>
-											<string>6BD6685F124351D70021A7A4</string>
 											<string>6BD668A3124361EB0021A7A4</string>
 											<string>6BD6691112436CEC0021A7A4</string>
-											<string>6BD6691212436CEC0021A7A4</string>
 											<string>6BD66930124374D60021A7A4</string>
 											<string>6BD66937124376780021A7A4</string>
 											<string>6BD66938124376780021A7A4</string>
@@ -397,7 +395,6 @@
 											<string>6BD6695C124377D40021A7A4</string>
 											<string>6BBB0361124E242E00533229</string>
 											<string>6BBB0363124E242E00533229</string>
-											<string>6BBB0365124E242E00533229</string>
 											<string>6BBB0366124E242E00533229</string>
 											<string>6BA8CEC01255BCE600272A3B</string>
 											<string>6BA8CECB1255C1A400272A3B</string>
@@ -407,14 +404,12 @@
 											<string>6BA8CF4D1255D44700272A3B</string>
 											<string>6BA8CF511255D44700272A3B</string>
 											<string>6BA8CF5B1255D49B00272A3B</string>
-											<string>6BA8CF941255D97400272A3B</string>
 											<string>6BA8CF951255D97400272A3B</string>
 											<string>6BA8CFA81255DC6500272A3B</string>
 											<string>6BA8CFBE1255DE0500272A3B</string>
 											<string>6BA8D10B125B0E8E00272A3B</string>
 											<string>6BA8D10C125B0E8E00272A3B</string>
 											<string>6BA8D10D125B0E8E00272A3B</string>
-											<string>6BB2EDF61261C75400E350F8</string>
 											<string>6BB2EDF91261C75400E350F8</string>
 											<string>6BB2EE241261C92300E350F8</string>
 											<string>6BB2EE251261C92300E350F8</string>
@@ -430,7 +425,12 @@
 											<string>6BB2EE671261D48100E350F8</string>
 											<string>6BB2EE681261D48100E350F8</string>
 											<string>6BB2EE691261D48100E350F8</string>
-											<string>6BB2EE6A1261D48100E350F8</string>
+											<string>6BB2EE711261DA0400E350F8</string>
+											<string>6BB2EE721261DA0400E350F8</string>
+											<string>6BB2EE731261DA0400E350F8</string>
+											<string>6BB2EE7A1264CD7900E350F8</string>
+											<string>6BB2EE7B1264CD7900E350F8</string>
+											<string>6BB2EE7C1264CD7900E350F8</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -444,18 +444,18 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {992, 471}}</string>
+								<string>{{0, 0}, {992, 558}}</string>
 								<key>RubberWindowFrame</key>
 								<string>0 59 1278 719 0 0 1280 778 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>471pt</string>
+							<string>558pt</string>
 						</dict>
 						<dict>
 							<key>Proportion</key>
-							<string>202pt</string>
+							<string>115pt</string>
 							<key>Tabs</key>
 							<array>
 								<dict>
@@ -523,7 +523,7 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {992, 175}}</string>
+										<string>{{10, 27}, {992, 88}}</string>
 										<key>RubberWindowFrame</key>
 										<string>0 59 1278 719 0 0 1280 778 </string>
 									</dict>
diff --git a/RecastDemo/Source/CrowdManager.cpp b/RecastDemo/Source/CrowdManager.cpp
index be5ae22..97f8eee 100644
--- a/RecastDemo/Source/CrowdManager.cpp
+++ b/RecastDemo/Source/CrowdManager.cpp
@@ -497,17 +497,20 @@ void PathCorridor::updateLocalNeighbourhood(const float collisionQueryRange, dtN
 		return;
 	
 	dtVcopy(m_localCenter, m_pos);
+
+	// First query non-overlapping polygons.
 	static const int MAX_LOCALS = 32;
 	dtPolyRef locals[MAX_LOCALS];
-	
 	const int nlocals = navquery->findLocalNeighbourhood(m_path[0], m_pos, collisionQueryRange,
 														 filter, locals, 0, MAX_LOCALS);
 	
+	// Secondly, store all polygon edges.
 	m_localSegCount = 0;
 	for (int j = 0; j < nlocals; ++j)
 	{
-		float segs[DT_VERTS_PER_POLYGON*3*2];
-		const int nsegs = navquery->getPolyWallSegments(locals[j], filter, segs);
+		static const int MAX_SEGS = DT_VERTS_PER_POLYGON*2;
+		float segs[MAX_SEGS*6];
+		const int nsegs = navquery->getPolyWallSegments(locals[j], filter, segs, MAX_SEGS);
 		for (int k = 0; k < nsegs; ++k)
 		{
 			const float* s = &segs[k*6];
diff --git a/RecastDemo/Source/NavMeshTesterTool.cpp b/RecastDemo/Source/NavMeshTesterTool.cpp
index fff0fce..11fdb8a 100644
--- a/RecastDemo/Source/NavMeshTesterTool.cpp
+++ b/RecastDemo/Source/NavMeshTesterTool.cpp
@@ -1118,8 +1118,9 @@ void NavMeshTesterTool::handleRender()
 				dd.depthMask(true);
 			}
 
-			float segs[DT_VERTS_PER_POLYGON*3*2];
-			const int nsegs = m_navQuery->getPolyWallSegments(m_polys[i], &m_filter, segs);
+			static const int MAX_SEGS = DT_VERTS_PER_POLYGON*2;
+			float segs[MAX_SEGS*6];
+			const int nsegs = m_navQuery->getPolyWallSegments(m_polys[i], &m_filter, segs, MAX_SEGS);
 			dd.begin(DU_DRAW_LINES, 2.0f);
 			for (int j = 0; j < nsegs; ++j)
 			{