[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60918] trunk/blender/extern/bullet2: bullet: Update to version 2.82 (bullet revision 2705)

Sergej Reich sergej.reich at googlemail.com
Fri Oct 25 05:43:20 CEST 2013


Revision: 60918
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60918
Author:   sergof
Date:     2013-10-25 03:43:20 +0000 (Fri, 25 Oct 2013)
Log Message:
-----------
bullet: Update to version 2.82 (bullet revision 2705)
    
Remove patch that has been applied upstream.

Fixes several bugs.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=2705

Modified Paths:
--------------
    trunk/blender/extern/bullet2/CMakeLists.txt
    trunk/blender/extern/bullet2/readme.txt
    trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
    trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
    trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
    trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
    trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
    trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
    trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
    trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
    trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
    trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
    trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp
    trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
    trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
    trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
    trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
    trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
    trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.cpp
    trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h
    trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
    trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
    trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp
    trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
    trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
    trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
    trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
    trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
    trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
    trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
    trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
    trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
    trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
    trunk/blender/extern/bullet2/src/BulletDynamics/Character/btCharacterControllerInterface.h
    trunk/blender/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp
    trunk/blender/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h
    trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
    trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h
    trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGearConstraint.h
    trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
    trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h
    trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
    trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
    trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
    trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
    trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
    trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h
    trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
    trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
    trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
    trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
    trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
    trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
    trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
    trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
    trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
    trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBody.h
    trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
    trunk/blender/extern/bullet2/src/BulletSoftBody/btSparseSDF.h
    trunk/blender/extern/bullet2/src/LinearMath/btIDebugDraw.h
    trunk/blender/extern/bullet2/src/LinearMath/btMatrix3x3.h
    trunk/blender/extern/bullet2/src/LinearMath/btQuaternion.h
    trunk/blender/extern/bullet2/src/LinearMath/btScalar.h
    trunk/blender/extern/bullet2/src/LinearMath/btSerializer.cpp
    trunk/blender/extern/bullet2/src/LinearMath/btSerializer.h
    trunk/blender/extern/bullet2/src/LinearMath/btVector3.cpp
    trunk/blender/extern/bullet2/src/LinearMath/btVector3.h
    trunk/blender/extern/bullet2/src/btBulletDynamicsCommon.h

Added Paths:
-----------
    trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.cpp
    trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h
    trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.cpp
    trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.h
    trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btFixedConstraint.cpp
    trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btFixedConstraint.h
    trunk/blender/extern/bullet2/src/BulletDynamics/Featherstone/
    trunk/blender/extern/bullet2/src/BulletDynamics/Featherstone/btMultiBody.cpp
    trunk/blender/extern/bullet2/src/BulletDynamics/Featherstone/btMultiBody.h
    trunk/blender/extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyConstraint.cpp
    trunk/blender/extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyConstraint.h
    trunk/blender/extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.cpp
    trunk/blender/extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h
    trunk/blender/extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp
    trunk/blender/extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h
    trunk/blender/extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.cpp
    trunk/blender/extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.h
    trunk/blender/extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyJointMotor.cpp
    trunk/blender/extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyJointMotor.h
    trunk/blender/extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyLink.h
    trunk/blender/extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyLinkCollider.h
    trunk/blender/extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyPoint2Point.cpp
    trunk/blender/extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyPoint2Point.h
    trunk/blender/extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodySolverConstraint.h
    trunk/blender/extern/bullet2/src/BulletDynamics/MLCPSolvers/
    trunk/blender/extern/bullet2/src/BulletDynamics/MLCPSolvers/btDantzigLCP.cpp
    trunk/blender/extern/bullet2/src/BulletDynamics/MLCPSolvers/btDantzigLCP.h
    trunk/blender/extern/bullet2/src/BulletDynamics/MLCPSolvers/btDantzigSolver.h
    trunk/blender/extern/bullet2/src/BulletDynamics/MLCPSolvers/btMLCPSolver.cpp
    trunk/blender/extern/bullet2/src/BulletDynamics/MLCPSolvers/btMLCPSolver.h
    trunk/blender/extern/bullet2/src/BulletDynamics/MLCPSolvers/btMLCPSolverInterface.h
    trunk/blender/extern/bullet2/src/BulletDynamics/MLCPSolvers/btPATHSolver.h
    trunk/blender/extern/bullet2/src/BulletDynamics/MLCPSolvers/btSolveProjectedGaussSeidel.h
    trunk/blender/extern/bullet2/src/LinearMath/btMatrixX.h

Removed Paths:
-------------
    trunk/blender/extern/bullet2/patches/ghost_character.patch

Modified: trunk/blender/extern/bullet2/CMakeLists.txt
===================================================================
--- trunk/blender/extern/bullet2/CMakeLists.txt	2013-10-25 02:20:23 UTC (rev 60917)
+++ trunk/blender/extern/bullet2/CMakeLists.txt	2013-10-25 03:43:20 UTC (rev 60918)
@@ -67,6 +67,8 @@
 	src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
 	src/BulletCollision/CollisionDispatch/btUnionFind.cpp
 	src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
+	src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.cpp
+	src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.cpp
 	src/BulletCollision/CollisionShapes/btBoxShape.cpp
 	src/BulletCollision/CollisionShapes/btBox2dShape.cpp
 	src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
@@ -140,6 +142,7 @@
 	src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
 	src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp
 	src/BulletDynamics/ConstraintSolver/btGearConstraint.cpp
+	src/BulletDynamics/ConstraintSolver/btFixedConstraint.cpp
 	src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
 	src/BulletDynamics/Dynamics/btRigidBody.cpp
 	src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
@@ -147,6 +150,15 @@
 	src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
 	src/BulletDynamics/Vehicle/btWheelInfo.cpp
 	src/BulletDynamics/Character/btKinematicCharacterController.cpp
+	src/BulletDynamics/Featherstone/btMultiBody.cpp
+	src/BulletDynamics/Featherstone/btMultiBodyConstraint.cpp
+	src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.cpp
+	src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp
+	src/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.cpp
+	src/BulletDynamics/Featherstone/btMultiBodyJointMotor.cpp
+	src/BulletDynamics/Featherstone/btMultiBodyPoint2Point.cpp
+	src/BulletDynamics/MLCPSolvers/btDantzigLCP.cpp
+	src/BulletDynamics/MLCPSolvers/btMLCPSolver.cpp
 	
 	src/BulletSoftBody/btSoftBody.cpp
 	src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
@@ -204,6 +216,8 @@
 	src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
 	src/BulletCollision/CollisionDispatch/btUnionFind.h
 	src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
+	src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h
+	src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.h
 	src/BulletCollision/CollisionShapes/btBoxShape.h
 	src/BulletCollision/CollisionShapes/btBox2dShape.h
 	src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
@@ -308,6 +322,7 @@
 	src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
 	src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h
 	src/BulletDynamics/ConstraintSolver/btGearConstraint.h
+	src/BulletDynamics/ConstraintSolver/btFixedConstraint.h
 	src/BulletDynamics/Dynamics/btActionInterface.h
 	src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
 	src/BulletDynamics/Dynamics/btDynamicsWorld.h
@@ -318,6 +333,22 @@
 	src/BulletDynamics/Vehicle/btWheelInfo.h
 	src/BulletDynamics/Character/btCharacterControllerInterface.h
 	src/BulletDynamics/Character/btKinematicCharacterController.h
+	src/BulletDynamics/Featherstone/btMultiBody.h
+	src/BulletDynamics/Featherstone/btMultiBodyConstraint.h
+	src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h
+	src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h
+	src/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.h
+	src/BulletDynamics/Featherstone/btMultiBodyJointMotor.h
+	src/BulletDynamics/Featherstone/btMultiBodyLink.h
+	src/BulletDynamics/Featherstone/btMultiBodyLinkCollider.h
+	src/BulletDynamics/Featherstone/btMultiBodyPoint2Point.h
+	src/BulletDynamics/Featherstone/btMultiBodySolverConstraint.h
+	src/BulletDynamics/MLCPSolvers/btDantzigLCP.h
+	src/BulletDynamics/MLCPSolvers/btDantzigSolver.h
+	src/BulletDynamics/MLCPSolvers/btMLCPSolver.h
+	src/BulletDynamics/MLCPSolvers/btMLCPSolverInterface.h
+	src/BulletDynamics/MLCPSolvers/btPATHSolver.h
+	src/BulletDynamics/MLCPSolvers/btSolveProjectedGaussSeidel.h
 	
 	src/BulletSoftBody/btSoftBody.h
 	src/BulletSoftBody/btSoftBodyInternals.h
@@ -359,6 +390,7 @@
 	src/LinearMath/btTransformUtil.h
 	src/LinearMath/btVector3.h
 	src/LinearMath/btPolarDecomposition.h
+	src/LinearMath/btMatrixX.h
 	
 	
 	src/btBulletCollisionCommon.h

Deleted: trunk/blender/extern/bullet2/patches/ghost_character.patch
===================================================================
--- trunk/blender/extern/bullet2/patches/ghost_character.patch	2013-10-25 02:20:23 UTC (rev 60917)
+++ trunk/blender/extern/bullet2/patches/ghost_character.patch	2013-10-25 03:43:20 UTC (rev 60918)
@@ -1,28 +0,0 @@
-Index: extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp
-===================================================================
---- extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp	(revision 49183)
-+++ extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp	(working copy)
-@@ -77,6 +77,9 @@
- 		if (convexResult.m_hitCollisionObject == m_me)
- 			return btScalar(1.0);
- 
-+		if (!convexResult.m_hitCollisionObject->hasContactResponse())
-+			return btScalar(1.0);
-+
- 		btVector3 hitNormalWorld;
- 		if (normalInWorldSpace)
- 		{
-@@ -173,7 +176,12 @@
- 		m_manifoldArray.resize(0);
- 
- 		btBroadphasePair* collisionPair = &m_ghostObject->getOverlappingPairCache()->getOverlappingPairArray()[i];
--		
-+		btCollisionObject* obj0 = static_cast<btCollisionObject*>(collisionPair->m_pProxy0->m_clientObject);
-+		btCollisionObject* obj1 = static_cast<btCollisionObject*>(collisionPair->m_pProxy1->m_clientObject);
-+
-+		if ((obj0 && !obj0->hasContactResponse()) || (obj1 && !obj1->hasContactResponse()))
-+			continue;
-+
- 		if (collisionPair->m_algorithm)
- 			collisionPair->m_algorithm->getAllContactManifolds(m_manifoldArray);
- 

Modified: trunk/blender/extern/bullet2/readme.txt
===================================================================
--- trunk/blender/extern/bullet2/readme.txt	2013-10-25 02:20:23 UTC (rev 60917)
+++ trunk/blender/extern/bullet2/readme.txt	2013-10-25 03:43:20 UTC (rev 60918)
@@ -7,8 +7,5 @@
 Apply patches/ghost_softbody.patch to prevent softbodies being hit by ghost objects.
 Originally committed in blender svn revision: 43905.
 
-Apply patches/ghost_character.patch to prevent characters from colliding with ghost objects.
-Mitchell
-
 Apply patches/convex_hull.patch to add access to the convex hull
 operation, used in the BMesh convex hull operator.

Modified: trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
===================================================================
--- trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h	2013-10-25 02:20:23 UTC (rev 60917)
+++ trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h	2013-10-25 03:43:20 UTC (rev 60918)
@@ -25,7 +25,6 @@
 struct btCollisionObjectWrapper;
 
 class btPersistentManifold;
-class btStackAlloc;
 class btPoolAllocator;
 
 struct btDispatcherInfo
@@ -47,8 +46,7 @@
 		m_useEpa(true),
 		m_allowedCcdPenetration(btScalar(0.04)),
 		m_useConvexConservativeDistanceUtil(false),
-		m_convexConservativeDistanceThreshold(0.0f),
-		m_stackAllocator(0)
+		m_convexConservativeDistanceThreshold(0.0f)
 	{
 
 	}
@@ -64,7 +62,6 @@
 	btScalar	m_allowedCcdPenetration;
 	bool		m_useConvexConservativeDistanceUtil;
 	btScalar	m_convexConservativeDistanceThreshold;
-	btStackAlloc*	m_stackAllocator;
 };
 
 ///The btDispatcher interface class can be used in combination with broadphase to dispatch calculations for overlapping pairs.

Modified: trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
===================================================================
--- trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp	2013-10-25 02:20:23 UTC (rev 60917)
+++ trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp	2013-10-25 03:43:20 UTC (rev 60918)
@@ -53,7 +53,7 @@
 
 void	btHashedOverlappingPairCache::cleanOverlappingPair(btBroadphasePair& pair,btDispatcher* dispatcher)
 {
-	if (pair.m_algorithm)
+	if (pair.m_algorithm && dispatcher)
 	{
 		{
 			pair.m_algorithm->~btCollisionAlgorithm();

Modified: trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
===================================================================
--- trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h	2013-10-25 02:20:23 UTC (rev 60917)
+++ trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h	2013-10-25 03:43:20 UTC (rev 60918)
@@ -96,7 +96,13 @@
 	btOverlapFilterCallback* m_overlapFilterCallback;
 	bool		m_blockedForChanges;
 
+protected:
+	
+	btAlignedObjectArray<int>	m_hashTable;
+	btAlignedObjectArray<int>	m_next;
+	btOverlappingPairCallback*	m_ghostPairCallback;
 
+
 public:
 	btHashedOverlappingPairCache();
 	virtual ~btHashedOverlappingPairCache();
@@ -265,12 +271,7 @@
 	virtual void	sortOverlappingPairs(btDispatcher* dispatcher);
 	
 
-protected:
 	
-	btAlignedObjectArray<int>	m_hashTable;
-	btAlignedObjectArray<int>	m_next;
-	btOverlappingPairCallback*	m_ghostPairCallback;
-	
 };
 
 

Modified: trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
===================================================================
--- trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h	2013-10-25 02:20:23 UTC (rev 60917)
+++ trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h	2013-10-25 03:43:20 UTC (rev 60918)
@@ -18,7 +18,6 @@
 
 struct btCollisionAlgorithmCreateFunc;
 
-class btStackAlloc;
 class btPoolAllocator;
 
 ///btCollisionConfiguration allows to configure Bullet collision detection
@@ -38,7 +37,6 @@
 
 	virtual btPoolAllocator* getCollisionAlgorithmPool() = 0;
 
-	virtual btStackAlloc*	getStackAllocator() = 0;
 
 	virtual btCollisionAlgorithmCreateFunc* getCollisionAlgorithmCreateFunc(int proxyType0,int proxyType1) =0;
 

Modified: trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list