Blender Git Loki

Git Commits -> Revision 643b0be

Revision 643b0be by Sergej Reich (master)
March 7, 2013, 17:53 (GMT)
bullet: Update to current svn, r2636

Apply patches in patches directory, remove patches that were applied
upstream.
If you made changes without adding a patch, please check.

Fixes [#32233] exporting bullet format results in corrupt files.

Commit Details:

Full Hash: 643b0be4cb3f73bd876493d2a7bd6f76ef27cf06
SVN Revision: 55096
Parent Commit: 46d32c8
Lines Changed: +8480, -3399

6 Added Paths:

/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h (+43, -0) (View)
/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGearConstraint.cpp (+54, -0) (View)
/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGearConstraint.h (+56, -0) (View)
/extern/bullet2/src/LinearMath/btPolarDecomposition.cpp (+99, -0) (View)
/extern/bullet2/src/LinearMath/btPolarDecomposition.h (+73, -0) (View)
/extern/bullet2/src/LinearMath/btVector3.cpp (+1639, -0) (View)

2 Deleted Paths:

/extern/bullet2/patches/make_id.patch (+0, -42)
/extern/bullet2/patches/pvs_warning_fixes.patch (+0, -31)

167 Modified Paths:

/extern/bullet2/CMakeLists.txt (+6, -0) (Diff)
/extern/bullet2/readme.txt (+0, -7) (Diff)
/extern/bullet2/src/btBulletCollisionCommon.h (+0, -1) (Diff)
/extern/bullet2/src/btBulletDynamicsCommon.h (+1, -0) (Diff)
/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h (+1, -1) (Diff)
/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h (+2, -1) (Diff)
/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h (+16, -3) (Diff)
/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h (+5, -5) (Diff)
/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp (+18, -0) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp (+1, -1) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h (+1, -1) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp (+16, -30) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h (+4, -4) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp (+11, -12) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h (+4, -4) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp (+1, -1) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h (+3, -3) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h (+4, -4) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp (+15, -11) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h (+4, -5) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp (+5, -5) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h (+36, -26) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp (+241, -220) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h (+25, -12) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp (+79, -66) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h (+7, -7) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp (+11, -11) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h (+4, -4) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp (+48, -31) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h (+15, -10) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp (+82, -37) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h (+4, -5) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp (+26, -25) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h (+6, -6) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h (+0, -2) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp (+1, -1) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h (+5, -5) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp (+20, -20) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h (+2, -1) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp (+39, -20) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h (+36, -14) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp (+2, -2) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp (+109, -155) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h (+7, -7) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp (+9, -8) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h (+4, -4) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp (+11, -11) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h (+4, -4) (Diff)
/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp (+0, -1) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btBox2dShape.h (+3, -1) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h (+3, -1) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h (+7, -1) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.h (+14, -3) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h (+10, -1) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp (+1, -3) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h (+3, -1) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h (+20, -1) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btConvex2dShape.h (+3, -1) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp (+42, -47) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h (+2, -2) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h (+2, -2) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp (+22, -40) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPolyhedron.cpp (+17, -11) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPolyhedron.h (+5, -2) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp (+20, -17) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h (+3, -1) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h (+14, -1) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h (+3, -1) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp (+4, -5) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h (+8, -2) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h (+3, -1) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp (+38, -23) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h (+3, -1) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp (+89, -64) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h (+6, -2) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp (+1, -3) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h (+2, -0) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h (+3, -1) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h (+2, -0) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp (+1, -1) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h (+3, -1) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h (+3, -1) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleInfoMap.h (+8, -8) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp (+22, -0) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h (+2, -2) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp (+1, -5) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h (+2, -1) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleShape.h (+4, -2) (Diff)
/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.h (+3, -1) (Diff)
/extern/bullet2/src/BulletCollision/Gimpact/btBoxCollision.h (+8, -10) (Diff)
/extern/bullet2/src/BulletCollision/Gimpact/btCompoundFromGimpact.h (+1, -6) (Diff)
/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp (+185, -157) (Diff)
/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h (+59, -55) (Diff)
/extern/bullet2/src/BulletCollision/Gimpact/gim_array.h (+2, -4) (Diff)
/extern/bullet2/src/BulletCollision/Gimpact/gim_box_collision.h (+5, -7) (Diff)
/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp (+0, -1) (Diff)
/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h (+2, -2) (Diff)
/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h (+14, -16) (Diff)
/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp (+7, -4) (Diff)
/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h (+33, -21) (Diff)
/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp (+154, -24) (Diff)
/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h (+1, -1) (Diff)
/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp (+12, -11) (Diff)
/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h (+4, -2) (Diff)
/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp (+18, -4) (Diff)
/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h (+4, -1) (Diff)
/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp (+26, -17) (Diff)
/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h (+5, -2) (Diff)
/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp (+2, -2) (Diff)
/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h (+79, -7) (Diff)
/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp (+16, -31) (Diff)
/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h (+4, -2) (Diff)
/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp (+1, -1) (Diff)
/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h (+8, -5) (Diff)
/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h (+3, -1) (Diff)
/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp (+15, -3) (Diff)
/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h (+2, -0) (Diff)
/extern/bullet2/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h (+1, -2) (Diff)
/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp (+4, -5) (Diff)
/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h (+2, -0) (Diff)
/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp (+701, -315) (Diff)
/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h (+38, -27) (Diff)
/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp (+7, -0) (Diff)
/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h (+3, -1) (Diff)
/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h (+118, -16) (Diff)
/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h (+16, -35) (Diff)
/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp (+4, -2) (Diff)
/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h (+33, -3) (Diff)
/extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h (+4, -1) (Diff)
/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp (+236, -27) (Diff)
/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h (+20, -2) (Diff)
/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h (+15, -0) (Diff)
/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp (+21, -24) (Diff)
/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h (+12, -103) (Diff)
/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp (+2, -2) (Diff)
/extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.cpp (+2, -2) (Diff)
/extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.h (+2, -2) (Diff)
/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp (+160, -60) (Diff)
/extern/bullet2/src/BulletSoftBody/btSoftBody.h (+18, -7) (Diff)
/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp (+29, -40) (Diff)
/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h (+9, -9) (Diff)
/extern/bullet2/src/BulletSoftBody/btSoftBodyData.h (+1, -1) (Diff)
/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h (+25, -47) (Diff)
/extern/bullet2/src/BulletSoftBody/btSoftBodySolvers.h (+1, -1) (Diff)
/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp (+9, -7) (Diff)
/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h (+5, -5) (Diff)
/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp (+2, -0) (Diff)
/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp (+5, -4) (Diff)
/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h (+4, -4) (Diff)
/extern/bullet2/src/BulletSoftBody/btSparseSDF.h (+6, -6) (Diff)
/extern/bullet2/src/LinearMath/btAabbUtil2.h (+2, -6) (Diff)
/extern/bullet2/src/LinearMath/btAlignedAllocator.cpp (+1, -1) (Diff)
/extern/bullet2/src/LinearMath/btAlignedObjectArray.h (+18, -1) (Diff)
/extern/bullet2/src/LinearMath/btConvexHull.cpp (+2, -9) (Diff)
/extern/bullet2/src/LinearMath/btConvexHullComputer.cpp (+9, -5) (Diff)
/extern/bullet2/src/LinearMath/btDefaultMotionState.h (+3, -1) (Diff)
/extern/bullet2/src/LinearMath/btGrahamScan2dConvexHull.h (+20, -13) (Diff)
/extern/bullet2/src/LinearMath/btIDebugDraw.h (+1, -0) (Diff)
/extern/bullet2/src/LinearMath/btMatrix3x3.h (+625, -34) (Diff)
/extern/bullet2/src/LinearMath/btQuadWord.h (+86, -22) (Diff)
/extern/bullet2/src/LinearMath/btQuaternion.h (+472, -25) (Diff)
/extern/bullet2/src/LinearMath/btScalar.h (+128, -8) (Diff)
/extern/bullet2/src/LinearMath/btSerializer.cpp (+905, -838) (Diff)
/extern/bullet2/src/LinearMath/btSerializer.h (+5, -4) (Diff)
/extern/bullet2/src/LinearMath/btTransform.h (+2, -4) (Diff)
/extern/bullet2/src/LinearMath/btVector3.h (+692, -116) (Diff)
/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp (+7, -7) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021