Index: code/branches/physics/visual_studio/vc8/bullet_collision.vcproj
===================================================================
--- code/branches/physics/visual_studio/vc8/bullet_collision.vcproj	(revision 2122)
+++ code/branches/physics/visual_studio/vc8/bullet_collision.vcproj	(revision 2149)
@@ -132,340 +132,360 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btAxisSweep3.cpp"
+			<Filter
+				Name="BroadphaseCollision"
 				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btBoxBoxCollisionAlgorithm.cpp"
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btAxisSweep3.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btBroadphaseProxy.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btCollisionAlgorithm.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btDbvt.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btDbvtBroadphase.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btDispatcher.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btMultiSapBroadphase.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btOverlappingPairCache.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btQuantizedBvh.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btSimpleBroadphase.cpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="CollisionDispatch"
 				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btBoxBoxDetector.cpp"
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btBoxBoxCollisionAlgorithm.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btBoxBoxDetector.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btCollisionDispatcher.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btCollisionObject.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btCollisionWorld.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btCompoundCollisionAlgorithm.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btConvexConcaveCollisionAlgorithm.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btConvexConvexAlgorithm.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btConvexPlaneCollisionAlgorithm.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btDefaultCollisionConfiguration.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btEmptyCollisionAlgorithm.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btManifoldResult.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btSimulationIslandManager.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btSphereBoxCollisionAlgorithm.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btSphereSphereCollisionAlgorithm.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btSphereTriangleCollisionAlgorithm.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btUnionFind.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\SphereTriangleDetector.cpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="CollisionShapes"
 				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btBoxShape.cpp"
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btBoxShape.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btBvhTriangleMeshShape.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btCapsuleShape.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btCollisionShape.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btCompoundShape.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btConcaveShape.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btConeShape.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btConvexHullShape.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btConvexInternalShape.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btConvexPointCloudShape.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btConvexShape.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btConvexTriangleMeshShape.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btCylinderShape.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btEmptyShape.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btHeightfieldTerrainShape.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btMinkowskiSumShape.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btMultimaterialTriangleMeshShape.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btMultiSphereShape.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btOptimizedBvh.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btPolyhedralConvexShape.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btScaledBvhTriangleMeshShape.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btShapeHull.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btSphereShape.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btStaticPlaneShape.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btStridingMeshInterface.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btTetrahedronShape.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btTriangleBuffer.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btTriangleCallback.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btTriangleIndexVertexArray.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btTriangleIndexVertexMaterialArray.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btTriangleMesh.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btTriangleMeshShape.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btUniformScalingShape.cpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="GIMPACT"
 				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btBroadphaseProxy.cpp"
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\btContactProcessing.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\btGenericPoolAllocator.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\btGImpactBvh.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\btGImpactCollisionAlgorithm.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\btGImpactQuantizedBvh.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\btGImpactShape.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\btTriangleShapeEx.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\gim_box_set.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\gim_contact.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\gim_memory.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\gim_tri_collision.cpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="NarrowPhaseCollision"
 				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btBvhTriangleMeshShape.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btCapsuleShape.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btCollisionAlgorithm.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btCollisionDispatcher.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btCollisionObject.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btCollisionShape.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btCollisionWorld.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btCompoundCollisionAlgorithm.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btCompoundShape.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btConcaveShape.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btConeShape.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\btContactProcessing.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btContinuousConvexCollision.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btConvexCast.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btConvexConcaveCollisionAlgorithm.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btConvexConvexAlgorithm.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btConvexHullShape.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btConvexInternalShape.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btConvexPlaneCollisionAlgorithm.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btConvexPointCloudShape.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btConvexShape.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btConvexTriangleMeshShape.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btCylinderShape.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btDbvt.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btDbvtBroadphase.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btDefaultCollisionConfiguration.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btDispatcher.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btEmptyCollisionAlgorithm.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btEmptyShape.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\btGenericPoolAllocator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\btGImpactBvh.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\btGImpactCollisionAlgorithm.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\btGImpactQuantizedBvh.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\btGImpactShape.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btGjkConvexCast.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btGjkEpa.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btGjkEpa2.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btGjkEpaPenetrationDepthSolver.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btGjkPairDetector.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btHeightfieldTerrainShape.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btManifoldResult.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btMinkowskiPenetrationDepthSolver.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btMinkowskiSumShape.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btMultimaterialTriangleMeshShape.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btMultiSapBroadphase.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btMultiSphereShape.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btOptimizedBvh.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btOverlappingPairCache.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btPersistentManifold.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btPolyhedralConvexShape.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btQuantizedBvh.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btRaycastCallback.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btScaledBvhTriangleMeshShape.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btShapeHull.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btSimpleBroadphase.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btSimulationIslandManager.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btSphereBoxCollisionAlgorithm.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btSphereShape.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btSphereSphereCollisionAlgorithm.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btSphereTriangleCollisionAlgorithm.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btStaticPlaneShape.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btStridingMeshInterface.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btSubSimplexConvexCast.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btTetrahedronShape.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btTriangleBuffer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btTriangleCallback.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btTriangleIndexVertexArray.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btTriangleIndexVertexMaterialArray.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btTriangleMesh.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btTriangleMeshShape.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\btTriangleShapeEx.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btUniformScalingShape.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btUnionFind.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btVoronoiSimplexSolver.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\gim_box_set.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\gim_contact.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\gim_memory.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\gim_tri_collision.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\SphereTriangleDetector.cpp"
-				>
-			</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btContinuousConvexCollision.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btConvexCast.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btGjkConvexCast.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btGjkEpa.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btGjkEpa2.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btGjkEpaPenetrationDepthSolver.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btGjkPairDetector.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btMinkowskiPenetrationDepthSolver.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btPersistentManifold.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btRaycastCallback.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btSubSimplexConvexCast.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btVoronoiSimplexSolver.cpp"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
@@ -474,4 +494,412 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
+			<Filter
+				Name="BroadphaseCollision"
+				>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btAxisSweep3.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btBroadphaseInterface.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btBroadphaseProxy.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btCollisionAlgorithm.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btDbvt.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btDbvtBroadphase.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btDispatcher.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btMultiSapBroadphase.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btOverlappingPairCache.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btOverlappingPairCallback.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btQuantizedBvh.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\BroadphaseCollision\btSimpleBroadphase.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="CollisionDispatch"
+				>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btBoxBoxCollisionAlgorithm.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btBoxBoxDetector.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btCollisionConfiguration.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btCollisionCreateFunc.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btCollisionDispatcher.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btCollisionObject.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btCollisionWorld.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btCompoundCollisionAlgorithm.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btConvexConcaveCollisionAlgorithm.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btConvexConvexAlgorithm.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btConvexPlaneCollisionAlgorithm.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btDefaultCollisionConfiguration.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btEmptyCollisionAlgorithm.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btManifoldResult.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btSimulationIslandManager.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btSphereBoxCollisionAlgorithm.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btSphereSphereCollisionAlgorithm.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btSphereTriangleCollisionAlgorithm.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\btUnionFind.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionDispatch\SphereTriangleDetector.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="CollisionShapes"
+				>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btBoxShape.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btBvhTriangleMeshShape.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btCapsuleShape.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btCollisionMargin.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btCollisionShape.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btCompoundShape.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btConcaveShape.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btConeShape.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btConvexHullShape.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btConvexInternalShape.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btConvexPointCloudShape.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btConvexShape.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btConvexTriangleMeshShape.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btCylinderShape.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btEmptyShape.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btHeightfieldTerrainShape.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btMaterial.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btMinkowskiSumShape.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btMultimaterialTriangleMeshShape.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btMultiSphereShape.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btOptimizedBvh.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btPolyhedralConvexShape.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btScaledBvhTriangleMeshShape.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btShapeHull.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btSphereShape.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btStaticPlaneShape.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btStridingMeshInterface.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btTetrahedronShape.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btTriangleBuffer.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btTriangleCallback.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btTriangleIndexVertexArray.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btTriangleIndexVertexMaterialArray.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btTriangleMesh.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btTriangleMeshShape.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btTriangleShape.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\CollisionShapes\btUniformScalingShape.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="GIMPACT"
+				>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\btBoxCollision.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\btClipPolygon.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\btContactProcessing.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\btGenericPoolAllocator.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\btGeometryOperations.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\btGImpactBvh.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\btGImpactCollisionAlgorithm.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\btGImpactMassUtil.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\btGImpactQuantizedBvh.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\btGImpactShape.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\btQuantization.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\GIMPACT\btTriangleShapeEx.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="NarrowPhaseCollision"
+				>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btContinuousConvexCollision.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btConvexCast.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btConvexPenetrationDepthSolver.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btDiscreteCollisionDetectorInterface.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btGjkConvexCast.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btGjkEpa.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btGjkEpa2.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btGjkEpaPenetrationDepthSolver.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btGjkPairDetector.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btManifoldPoint.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btMinkowskiPenetrationDepthSolver.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btPersistentManifold.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btPointCollector.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btRaycastCallback.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btSimplexSolverInterface.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btSubSimplexConvexCast.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\bullet\BulletCollision\NarrowPhaseCollision\btVoronoiSimplexSolver.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 	</Files>
