[Bf-blender-cvs] [4446c3a593c] master: Sync Bullet to upstream
Sebastian Parborg
noreply at git.blender.org
Wed Sep 2 20:50:16 CEST 2020
Commit: 4446c3a593c51603e135e38951607b9b668ddec5
Author: Sebastian Parborg
Date: Wed Sep 2 20:41:30 2020 +0200
Branches: master
https://developer.blender.org/rB4446c3a593c51603e135e38951607b9b668ddec5
Sync Bullet to upstream
This syncs Bullet to the latest upstream git version as of writing this.
(commit 47b0259b9700455022b5cf79b651cc1dc71dd59e).
===================================================================
M extern/bullet2/CMakeLists.txt
D extern/bullet2/patches/blender.patch
D extern/bullet2/patches/btPolyhedralConvexShape_Inertia_fix.patch
A extern/bullet2/patches/inertia.patch
D extern/bullet2/src/Bullet-C-Api.h
M extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
M extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
A extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3Internal.h
M extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
M extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp
M extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
M extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp
M extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
M extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.cpp
M extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
M extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
M extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
M extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.cpp
M extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
D extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp
D extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h
M extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
M extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
M extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h
M extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
M extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
M extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
M extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
M extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
M extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
M extern/bullet2/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp
M extern/bullet2/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h
M extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp
M extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h
M extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
M extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
M extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
M extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
M extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
M extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
M extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
M extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
A extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcherMt.cpp
A extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcherMt.h
M extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
M extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
M extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h
M extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
M extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
M extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.cpp
M extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.h
M extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
M extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
M extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.cpp
M extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h
M extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp
M extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h
M extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
M extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
M extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
M extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
M extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
M extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
M extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
M extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
M extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp
M extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h
M extern/bullet2/src/BulletCollision/CollisionDispatch/btGhostObject.cpp
M extern/bullet2/src/BulletCollision/CollisionDispatch/btGhostObject.h
M extern/bullet2/src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.cpp
M extern/bullet2/src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.h
M extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp
M extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h
M extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
M extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h
M extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
M extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h
M extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
M extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h
M extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
M extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h
M extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
M extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
M extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.cpp
M extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btBox2dShape.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btBox2dShape.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionMargin.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btConvex2dShape.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btConvex2dShape.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPolyhedron.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPolyhedron.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h
A extern/bullet2/src/BulletCollision/CollisionShapes/btMiniSDF.cpp
A extern/bullet2/src/BulletCollision/CollisionShapes/btMiniSDF.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
A extern/bullet2/src/BulletCollision/CollisionShapes/btSdfCollisionShape.cpp
A extern/bullet2/src/BulletCollision/CollisionShapes/btSdfCollisionShape.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleCallback.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleCallback.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleInfoMap.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleShape.h
M extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp
M extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.h
M extern/bullet2/src/BulletCollision/Gimpact/btBoxCollision.h
M extern/bullet2/src/BulletCollision/Gimpact/btClipPolygon.h
M extern/bullet2/src/BulletCollision/Gimpact/btCompoundFromGimpact.h
M extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.cpp
M extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.h
A extern/bullet2/src/BulletCollision/Gimpact/btContactProcessingStructs.h
M extern/bullet2/src/BulletCollision/Gimpact/btGImpactBvh.cpp
M extern/bullet2/src/BulletCollision/Gimpact/btGImpactBvh.h
A extern/bullet2/src/BulletCollision/Gimpact/btGImpactBvhStructs.h
M extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp
M extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h
M extern/bullet2/src/BulletCollision/Gimpact/btGImpactMassUtil.h
M extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp
M extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h
A extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvhStructs.h
M extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.cpp
M extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.h
M extern/bullet2/src/BulletCollision/Gimpact/btGenericPoolAllocator.cpp
M extern/bullet2/src/BulletCollision/Gimpact/btGenericPoolAllocator.h
M extern/bullet2/src/BulletCollision/Gimpact/btGeometryOperations.h
M extern/bullet2/src/BulletCollision/Gimpact/btQuantization.h
M extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.cpp
M extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.h
M extern/bullet2/src/BulletCollision/Gimpact/gim_array.h
M extern/bullet2/src/BulletCollision/Gimpact/gim_basic_geometry_operations.h
M extern/bullet2/src/BulletCollision/Gimpact/gim_bitset.h
M extern/bullet2/src/BulletCollision/Gimpact/gim_box_collision.h
M extern/bullet2/src/BulletCollision/Gimpact/gim_box_set.cpp
M extern/bullet2/src/BulletCollision/Gimpact/gim_box_set.h
M extern/bullet2/src/BulletCollision/Gimpact/gim_clip_polygon.h
M extern/bullet2/src/BulletCollision/Gimpact/gim_contact.cpp
M extern/bullet2/src/BulletCollision/Gimpact/gim_contact.h
M extern/bullet2/src/BulletCollision/Gimpact/gim_geom_types.h
M extern/bullet2/src/BulletCollision/Gimpact/gim_geometry.h
M extern/bullet2/src/BulletCollision/Gimpact/gim_hash_table.h
M extern/bullet2/src/BulletCollision/Gimpact/gim_linear_math.h
M extern/bullet2/src/BulletCollision/Gimpact/gim_math.h
M extern/bullet2/src/BulletCollision/Gimpact/gim_memory.cpp
M extern/bullet2/src/BulletCollision/Gimpact/gim_memory.h
A extern/bullet2/src/BulletCollision/Gimpact/gim_pair.h
M extern/bullet2/src/BulletCollision/Gimpact/gim_radixsort.h
M extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.cpp
M extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.h
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btComputeGjkEpaPenetration.h
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkCollisionDescription.h
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa3.h
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMprPenetration.h
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPointCollector.h
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
M extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h
M extern/bullet2/src/BulletDynamics/Character/btCharacterControllerInterface.h
M extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp
M extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h
A extern/bullet2/src/BulletDynamics/ConstraintSolver/btBatchedConstraints.cpp
A extern/bullet2/src/BulletDynamics/ConstraintSolver/btBatchedConstraints.h
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.h
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btFixedConstraint.cpp
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btFixedConstraint.h
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btGearConstraint.cpp
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btGearConstraint.h
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.cpp
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.h
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btNNCGConstraintSolver.cpp
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btNNCGConstraintSolver.h
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
A extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolverMt.cpp
A extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolverMt.h
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp
M extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h
D extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp
M extern/bullet2/src/BulletDynamics/Dynamics/btActionInterface.h
M extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
M extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
A extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.cpp
A extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.h
M extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
M extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
M extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
M extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
M extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
A extern/bullet2/src/BulletDynamics/Dynamics/btSimulationIslandManagerMt.cpp
A extern/bullet2/src/BulletDynamics/Dynamics/btSimulationIslandManagerMt.h
M extern/bullet2/src/BulletDynamics/Featherstone/btMultiBody.cpp
M extern/bullet2/src/BulletDynamics/Featherstone/btMultiBody.h
M extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyConstraint.cpp
M extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyConstraint.h
M extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.cpp
M extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h
M extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp
M extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h
A extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyFixedConstraint.cpp
A extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyFixedConstraint.h
A extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyGearConstraint.cpp
A extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyGearConstraint.h
A extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyInplaceSolverIslandCallback.h
M extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyJointFeedback.h
M extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.cpp
M extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.h
M extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyJointMotor.cpp
M extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyJointMotor.h
M extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyLink.h
M extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyLinkCollider.h
A extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyMLCPConstraintSolver.cpp
A extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyMLCPConstraintSolver.h
M extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyPoint2Point.cpp
M extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyPoint2Point.h
A extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodySliderConstraint.cpp
A extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodySliderConstraint.h
M extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodySolverConstraint.h
A extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodySphericalJointMotor.cpp
A extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodySphericalJointMotor.h
M extern/bullet2/src/BulletDynamics/MLCPSolvers/btDantzigLCP.cpp
M extern/bullet2/src/BulletDynamics/MLCPSolvers/btDantzigLCP.h
M extern/bullet2/src/BulletDynamics/MLCPSolvers/btDantzigSolver.h
M extern/bullet2/src/BulletDynamics/MLCPSolvers/btLemkeAlgorithm.cpp
M extern/bullet2/src/BulletDynamics/MLCPSolvers/btLemkeAlgorithm.h
M extern/bullet2/src/BulletDynamics/MLCPSolvers/btLemkeSolver.h
M extern/bullet2/src/BulletDynamics/MLCPSolvers/btMLCPSolver.cpp
M extern/bullet2/src/BulletDynamics/MLCPSolvers/btMLCPSolver.h
M extern/bullet2/src/BulletDynamics/MLCPSolvers/btMLCPSolverInterface.h
M extern/bullet2/src/BulletDynamics/MLCPSolvers/btPATHSolver.h
M extern/bullet2/src/BulletDynamics/MLCPSolvers/btSolveProjectedGaussSeidel.h
M extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
M extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h
M extern/bullet2/src/BulletDynamics/Vehicle/btVehicleRaycaster.h
M extern/bullet2/src/BulletDynamics/Vehicle/btWheelInfo.cpp
M extern/bullet2/src/BulletDynamics/Vehicle/btWheelInfo.h
A extern/bullet2/src/BulletSoftBody/DeformableBodyInplaceSolverIslandCallback.h
A extern/bullet2/src/BulletSoftBody/btCGProjection.h
A extern/bullet2/src/BulletSoftBody/btConjugateGradient.h
A extern/bullet2/src/BulletSoftBody/btConjugateResidual.h
M extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.cpp
M extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.h
A extern/bullet2/src/BulletSoftBody/btDeformableBackwardEulerObjective.cpp
A extern/bullet2/src/BulletSoftBody/btDeformableBackwardEulerObjective.h
A extern/bullet2/src/BulletSoftBody/btDeformableBodySolver.cpp
A extern/bullet2/src/BulletSoftBody/btDeformableBodySolver.h
A extern/bullet2/src/BulletSoftBody/btDeformableContactConstraint.cpp
A extern/bullet2/src/BulletSoftBody/btDeformableContactConstraint.h
A extern/bullet2/src/BulletSoftBody/btDeformableContactProjection.cpp
A extern/bullet2/src/BulletSoftBody/btDeformableContactProjection.h
A extern/bullet2/src/BulletSoftBody/btDeformableCorotatedForce.h
A extern/bullet2/src/BulletSoftBody/btDeformableGravityForce.h
A extern/bullet2/src/BulletSoftBody/btDeformableLagrangianForce.h
A extern/bullet2/src/BulletSoftBody/btDeformableLinearElasticityForce.h
A extern/bullet2/src/BulletSoftBody/btDeformableMassSpringForce.h
A extern/bullet2/src/BulletSoftBody/btDeformableMousePickingForce.h
A extern/bullet2/src/BulletSoftBody/btDeformableMultiBodyConstraintSolver.cpp
A extern/bullet2/src/BulletSoftBody/btDeformableMultiBodyConstraintSolver.h
A extern/bullet2/src/BulletSoftBody/btDeformableMultiBodyDynamicsWorld.cpp
A extern/bullet2/src/BulletSoftBody/btDeformableMultiBodyDynamicsWorld.h
A extern/bullet2/src/BulletSoftBody/btDeformableNeoHookeanForce.h
A extern/bullet2/src/BulletSoftBody/btKrylovSolver.h
A extern/bullet2/src/BulletSoftBody/btPreconditioner.h
M extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
M extern/bullet2/src/BulletSoftBody/btSoftBody.h
M extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
M extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
M extern/bullet2/src/BulletSoftBody/btSoftBodyData.h
M extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
M extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
M extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
M extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
M extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h
M extern/bullet2/src/BulletSoftBody/btSoftBodySolverVertexBuffer.h
M extern/bullet2/src/BulletSoftBody/btSoftBodySolvers.h
A extern/bullet2/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.cpp
A extern/bullet2/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.h
M extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
M extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
M extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
M extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
M extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
M extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
M extern/bullet2/src/BulletSoftBody/btSparseSDF.h
A extern/bullet2/src/BulletSoftBody/poly34.cpp
A extern/bullet2/src/BulletSoftBody/poly34.h
A extern/bullet2/src/LinearMath/TaskScheduler/btTaskScheduler.cpp
A extern/bullet2/src/LinearMath/TaskScheduler/btThreadSupportInterface.h
A extern/bullet2/src/LinearMath/TaskScheduler/btThreadSupportPosix.cpp
A extern/bullet2/src/LinearMath/TaskScheduler/btThreadSupportWin32.cpp
M extern/bullet2/src/LinearMath/btAabbUtil2.h
M extern/bullet2/src/LinearMath/btAlignedAllocator.cpp
M extern/bullet2/src/LinearMath/btAlignedAllocator.h
M extern/bullet2/src/LinearMath/btAlignedObjectArray.h
M extern/bullet2/src/LinearMath/btConvexHull.cpp
M extern/bullet2/src/LinearMath/btConvexHull.h
M extern/bullet2/src/LinearMath/btConvexHullComputer.cpp
M extern/bullet2/src/LinearMath/btConvexHullComputer.h
M extern/bullet2/src/LinearMath/btCpuFeatureUtility.h
M extern/bullet2/src/LinearMath/btDefaultMotionState.h
M extern/bullet2/src/LinearMath/btGeometryUtil.cpp
M extern/bullet2/src/LinearMath/btGeometryUtil.h
M extern/bullet2/src/LinearMath/btGrahamScan2dConvexHull.h
M extern/bullet2/src/LinearMath/btHashMap.h
M extern/bullet2/src/LinearMath/btIDebugDraw.h
A extern/bullet2/src/LinearMath/btImplicitQRSVD.h
M extern/bullet2/src/LinearMath/btList.h
M extern/bullet2/src/LinearMath/btMatrix3x3.h
M extern/bullet2/src/LinearMath/btMatrixX.h
M extern/bullet2/src/LinearMath/btMinMax.h
A extern/bullet2/src/LinearMath/btModifiedGramSchmidt.h
M extern/bullet2/src/LinearMath/btMotionState.h
M extern/bullet2/src/LinearMath/btPolarDecomposition.cpp
M extern/bullet2/src/LinearMath/btPolarDecomposition.h
M extern/bullet2/src/LinearMath/btPoolAllocator.h
M extern/bullet2/src/LinearMath/btQuadWord.h
M extern/bullet2/src/LinearMath/btQuaternion.h
M extern/bullet2/src/LinearMath/btQuickprof.cpp
M extern/bullet2/src/LinearMath/btQuickprof.h
M extern/bullet2/src/LinearMath/btRandom.h
A extern/bullet2/src/LinearMath/btReducedVector.cpp
A extern/bullet2/src/LinearMath/btReducedVector.h
M extern/bullet2/src/LinearMath/btScalar.h
M extern/bullet2/src/LinearMath/btSerializer.cpp
M extern/bullet2/src/LinearMath/btSerializer.h
A extern/bullet2/src/LinearMath/btSerializer64.cpp
M extern/bullet2/src/LinearMath/btSpatialAlgebra.h
M extern/bullet2/src/LinearMath/btStackAlloc.h
A extern/bullet2/src/LinearMath/btThreads.cpp
A extern/bullet2/src/LinearMath/btThreads.h
M extern/bullet2/src/LinearMath/btTransform.h
M extern/bullet2/src/LinearMath/btTransformUtil.h
M extern/bullet2/src/LinearMath/btVector3.cpp
M extern/bullet2/src/LinearMath/btVector3.h
M extern/bullet2/src/btBulletCollisionCommon.h
M extern/bullet2/src/btBulletDynamicsCommon.h
===================================================================
diff --git a/extern/bullet2/CMakeLists.txt b/extern/bullet2/CMakeLists.txt
index fd043bb9048..648442e1bd9 100644
--- a/extern/bullet2/CMakeLists.txt
+++ b/extern/bullet2/CMakeLists.txt
@@ -47,7 +47,6 @@ set(SRC
src/BulletCollision/BroadphaseCollision/btDbvt.cpp
src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
src/BulletCollision/BroadphaseCollision/btDispatcher.cpp
- src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp
src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
@@ -95,12 +94,14 @@ set(SRC
src/BulletCollision/CollisionShapes/btCylinderShape.cpp
src/BulletCollision/CollisionShapes/btEmptyShape.cpp
src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
+ src/BulletCollision/CollisionShapes/btMiniSDF.cpp
src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp
src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp
src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
+ src/BulletCollision/CollisionShapes/btSdfCollisionShape.cpp
src/BulletCollision/CollisionShapes/btShapeHull.cpp
src/BulletCollision/CollisionShapes/btSphereShape.cpp
src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp
@@ -154,7 +155,6 @@ set(SRC
src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp
src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp
- src/BulletDynamics/Dynamics/Bullet-C-API.cpp
src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
src/BulletDynamics/Dynamics/btRigidBody.cpp
src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
@@ -187,6 +187,7 @@ set(SRC
src/LinearMath/btPolarDecomposition.cpp
src/LinearMath/btQuickprof.cpp
src/LinearMath/btSerializer.cpp
+ src/LinearMath/btSerializer64.cpp
src/LinearMath/btVector3.cpp
src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
@@ -196,7 +197,6 @@ set(SRC
src/BulletCollision/BroadphaseCollision/btDbvt.h
src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
src/BulletCollision/BroadphaseCollision/btDispatcher.h
- src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h
src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h
src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
@@ -250,12 +250,14 @@ set(SRC
src/BulletCollision/CollisionShapes/btEmptyShape.h
src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
src/BulletCollision/CollisionShapes/btMaterial.h
+ src/BulletCollision/CollisionShapes/btMiniSDF.h
src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
src/BulletCollision/CollisionShapes/btMultiSphereShape.h
src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
src/BulletCollision/CollisionShapes/btOptimizedBvh.h
src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
+ src/BulletCollision/CollisionShapes/btSdfCollisionShape.h
src/BulletCollision/CollisionShapes/btShapeHull.h
src/BulletCollision/CollisionShapes/btSphereShape.h
src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
@@ -417,7 +419,6 @@ set(SRC
src/btBulletCollisionCommon.h
src/btBulletDynamicsCommon.h
- src/Bullet-C-Api.h
)
set(LIB
diff --git a/extern/bullet2/patches/blender.patch b/extern/bullet2/patches/blender.patch
deleted file mode 100644
index b4b24fdc220..00000000000
--- a/extern/bullet2/patches/blender.patch
+++ /dev/null
@@ -1,368 +0,0 @@
-diff --git a/extern/bullet2/src/LinearMath/btVector3.h b/extern/bullet2/src/LinearMath/btVector3.h
-index 839b19c..3058195 100644
---- a/extern/bullet2/src/LinearMath/btVector3.h
-+++ b/extern/bullet2/src/LinearMath/btVector3.h
-@@ -39,7 +39,7 @@ subject to the following restrictions:
- #endif
-
-
--#define BT_SHUFFLE(x,y,z,w) ((w)<<6 | (z)<<4 | (y)<<2 | (x))
-+#define BT_SHUFFLE(x,y,z,w) (((w) << 6 | (z) << 4 | (y) << 2 | (x)) & 0xff)
- //#define bt_pshufd_ps( _a, _mask ) (__m128) _mm_shuffle_epi32((__m128i)(_a), (_mask) )
- #define bt_pshufd_ps( _a, _mask ) _mm_shuffle_ps((_a), (_a), (_mask) )
- #define bt_splat3_ps( _a, _i ) bt_pshufd_ps((_a), BT_SHUFFLE(_i,_i,_i, 3) )
-diff --git a/extern/bullet2/src/LinearMath/btScalar.h b/extern/bullet2/src/LinearMath/btScalar.h
---- a/extern/bullet2/src/LinearMath/btScalar.h
-+++ b/extern/bullet2/src/LinearMath/btScalar.h
-@@ -16,6 +16,9 @@
-
- #ifndef BT_SCALAR_H
- #define BT_SCALAR_H
-+#if defined(_MSC_VER) && defined(__clang__) /* clang supplies it's own overloads already */
-+#define BT_NO_SIMD_OPERATOR_OVERLOADS
-+#endif
-
- #ifdef BT_MANAGED_CODE
- //Aligned data types not supported in managed code
-@@ -83,7 +86,7 @@
- #ifdef BT_USE_SSE
-
- #if (_MSC_FULL_VER >= 170050727)//Visual Studio 2012 can compile SSE4/FMA3 (but SSE4/FMA3 is not enabled by default)
-- #define BT_ALLOW_SSE4
-+ //#define BT_ALLOW_SSE4 //disable this cause blender targets sse2
- #endif //(_MSC_FULL_VER >= 160040219)
-
- //BT_USE_SSE_IN_API is disabled under Windows by default, because
-@@ -102,7 +105,7 @@
- #endif //__MINGW32__
-
- #ifdef BT_DEBUG
-- #ifdef _MSC_VER
-+ #if defined(_MSC_VER) && !defined(__clang__)
- #include <stdio.h>
- #define btAssert(x) { if(!(x)){printf("Assert "__FILE__ ":%u ("#x")\n", __LINE__);__debugbreak(); }}
- #else//_MSC_VER
-diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
-index be9eca6..ec40c96 100644
---- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
-+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
-@@ -15,7 +15,7 @@ subject to the following restrictions:
-
-
- /**
-- * @mainpage Bullet Documentation
-+ * @page Bullet Documentation
- *
- * @section intro_sec Introduction
- * Bullet is a Collision Detection and Rigid Body Dynamics Library. The Library is Open Source and free for commercial use, under the ZLib license ( http://opensource.org/licenses/zlib-license.php ).
-diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.cpp
-index 36dd043..57eb817 100644
---- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.cpp
-+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.cpp
-@@ -579,14 +579,10 @@ btCollisionShape* btCollisionWorldImporter::convertCollisionShape( btCollisionS
- btCompoundShapeData* compoundData = (btCompoundShapeData*)shapeData;
- btCompoundShape* compoundShape = createCompoundShape();
-
-- btCompoundShapeChildData* childShapeDataArray = &compoundData->m_childShapePtr[0];
--
-
- btAlignedObjectArray<btCollisionShape*> childShapes;
- for (int i=0;i<compoundData->m_numChildShapes;i++)
- {
-- btCompoundShapeChildData* ptr = &compoundData->m_childShapePtr[i];
--
- btCollisionShapeData* cd = compoundData->m_childShapePtr[i].m_childShape;
-
- btCollisionShape* childShape = convertCollisionShape(cd);
-diff --git a/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp b/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp
-index 57fc119..31faf1d 100644
---- a/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp
-+++ b/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp
-@@ -29,14 +29,11 @@ subject to the following restrictions:
- static btVector3
- getNormalizedVector(const btVector3& v)
- {
-- btScalar l = v.length();
-- btVector3 n = v;
-- if (l < SIMD_EPSILON) {
-- n.setValue(0,0,0);
-- } else {
-- n /= l;
-- }
-+ btVector3 n(0, 0, 0);
-
-+ if (v.length() > SIMD_EPSILON) {
-+ n = v.normalized();
-+ }
- return n;
- }
-
-diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h
-index 27ccefe..8e4456e 100644
---- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h
-+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h
-@@ -37,8 +37,13 @@ struct btSimdScalar
- {
-
- }
--
-+/* workaround for clang 3.4 ( == apple clang 5.1 ) issue, friction would fail with forced inlining */
-+#if (defined(__clang__) && defined(__apple_build_version__) && (__clang_major__ == 5) && (__clang_minor__ == 1)) \
-+|| (defined(__clang__) && !defined(__apple_build_version__) && (__clang_major__ == 3) && (__clang_minor__ == 4))
-+ inline __attribute__ ((noinline)) btSimdScalar(float fl)
-+#else
- SIMD_FORCE_INLINE btSimdScalar(float fl)
-+#endif
- :m_vec128 (_mm_set1_ps(fl))
- {
- }
-diff --git a/extern/bullet2/src/BulletDynamics/Featherstone/btMultiBody.cpp b/extern/bullet2/src/BulletDynamics/Featherstone/btMultiBody.cpp
-index 5d62da7..fcd312e 100644
---- a/extern/bullet2/src/BulletDynamics/Featherstone/btMultiBody.cpp
-+++ b/extern/bullet2/src/BulletDynamics/Featherstone/btMultiBody.cpp
-@@ -28,7 +28,6 @@
- #include "btMultiBodyJointFeedback.h"
- #include "LinearMath/btTransformUtil.h"
- #include "LinearMath/btSerializer.h"
--#include "Bullet3Common/b3Logging.h"
- // #define INCLUDE_GYRO_TERM
-
- ///todo: determine if we need these options. If so, make a proper API, otherwise delete those globals
-@@ -1732,7 +1731,6 @@ void btMultiBody::goToSleep()
-
- void btMultiBody::checkMotionAndSleepIfRequired(btScalar timestep)
- {
-- int num_links = getNumLinks();
- extern bool gDisableDeactivation;
- if (!m_canSleep || gDisableDeactivation)
- {
-diff --git a/extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.cpp b/extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyCon
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list