[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55096] trunk/blender: bullet: Update to current svn, r2636
Sergej Reich
sergej.reich at googlemail.com
Thu Mar 7 18:53:17 CET 2013
Revision: 55096
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55096
Author: sergof
Date: 2013-03-07 17:53:16 +0000 (Thu, 07 Mar 2013)
Log Message:
-----------
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.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=2636
Modified Paths:
--------------
trunk/blender/extern/bullet2/CMakeLists.txt
trunk/blender/extern/bullet2/readme.txt
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.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/btConvex2dConvex2dAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btBox2dShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvex2dShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPolyhedron.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPolyhedron.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleInfoMap.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleShape.h
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btBoxCollision.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btCompoundFromGimpact.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_array.h
trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_box_collision.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.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.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp
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.cpp
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/ConstraintSolver/btUniversalConstraint.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.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
trunk/blender/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
trunk/blender/extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.cpp
trunk/blender/extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.h
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBody.h
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyData.h
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftBodySolvers.h
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
trunk/blender/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
trunk/blender/extern/bullet2/src/BulletSoftBody/btSparseSDF.h
trunk/blender/extern/bullet2/src/LinearMath/btAabbUtil2.h
trunk/blender/extern/bullet2/src/LinearMath/btAlignedAllocator.cpp
trunk/blender/extern/bullet2/src/LinearMath/btAlignedObjectArray.h
trunk/blender/extern/bullet2/src/LinearMath/btConvexHull.cpp
trunk/blender/extern/bullet2/src/LinearMath/btConvexHullComputer.cpp
trunk/blender/extern/bullet2/src/LinearMath/btDefaultMotionState.h
trunk/blender/extern/bullet2/src/LinearMath/btGrahamScan2dConvexHull.h
trunk/blender/extern/bullet2/src/LinearMath/btIDebugDraw.h
trunk/blender/extern/bullet2/src/LinearMath/btMatrix3x3.h
trunk/blender/extern/bullet2/src/LinearMath/btQuadWord.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/btTransform.h
trunk/blender/extern/bullet2/src/LinearMath/btVector3.h
trunk/blender/extern/bullet2/src/btBulletCollisionCommon.h
trunk/blender/extern/bullet2/src/btBulletDynamicsCommon.h
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
Added Paths:
-----------
trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGearConstraint.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGearConstraint.h
trunk/blender/extern/bullet2/src/LinearMath/btConvexHullComputer.cpp.orig
trunk/blender/extern/bullet2/src/LinearMath/btPolarDecomposition.cpp
trunk/blender/extern/bullet2/src/LinearMath/btPolarDecomposition.h
trunk/blender/extern/bullet2/src/LinearMath/btVector3.cpp
Removed Paths:
-------------
trunk/blender/extern/bullet2/patches/make_id.patch
trunk/blender/extern/bullet2/patches/pvs_warning_fixes.patch
Property Changed:
----------------
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
Modified: trunk/blender/extern/bullet2/CMakeLists.txt
===================================================================
--- trunk/blender/extern/bullet2/CMakeLists.txt 2013-03-07 17:52:51 UTC (rev 55095)
+++ trunk/blender/extern/bullet2/CMakeLists.txt 2013-03-07 17:53:16 UTC (rev 55096)
@@ -139,6 +139,7 @@
src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp
src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp
+ src/BulletDynamics/ConstraintSolver/btGearConstraint.cpp
src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
src/BulletDynamics/Dynamics/btRigidBody.cpp
src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
@@ -162,6 +163,8 @@
src/LinearMath/btGeometryUtil.cpp
src/LinearMath/btQuickprof.cpp
src/LinearMath/btSerializer.cpp
+ src/LinearMath/btVector3.cpp
+ src/LinearMath/btPolarDecomposition.cpp
src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
@@ -183,6 +186,7 @@
src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
+ src/BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h
src/BulletCollision/CollisionDispatch/btCollisionObject.h
src/BulletCollision/CollisionDispatch/btCollisionWorld.h
src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
@@ -303,6 +307,7 @@
src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h
+ src/BulletDynamics/ConstraintSolver/btGearConstraint.h
src/BulletDynamics/Dynamics/btActionInterface.h
src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
src/BulletDynamics/Dynamics/btDynamicsWorld.h
@@ -353,6 +358,7 @@
src/LinearMath/btTransform.h
src/LinearMath/btTransformUtil.h
src/LinearMath/btVector3.h
+ src/LinearMath/btPolarDecomposition.h
src/btBulletCollisionCommon.h
Deleted: trunk/blender/extern/bullet2/patches/make_id.patch
===================================================================
--- trunk/blender/extern/bullet2/patches/make_id.patch 2013-03-07 17:52:51 UTC (rev 55095)
+++ trunk/blender/extern/bullet2/patches/make_id.patch 2013-03-07 17:53:16 UTC (rev 55096)
@@ -1,42 +0,0 @@
-Index: src/LinearMath/btSerializer.h
-===================================================================
---- src/LinearMath/btSerializer.h (revision 46625)
-+++ src/LinearMath/btSerializer.h (working copy)
-@@ -106,23 +106,23 @@
-
- #define BT_HEADER_LENGTH 12
- #if defined(__sgi) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__BIG_ENDIAN__)
--# define MAKE_ID(a,b,c,d) ( (int)(a)<<24 | (int)(b)<<16 | (c)<<8 | (d) )
-+# define BT_MAKE_ID(a,b,c,d) ( (int)(a)<<24 | (int)(b)<<16 | (c)<<8 | (d) )
- #else
--# define MAKE_ID(a,b,c,d) ( (int)(d)<<24 | (int)(c)<<16 | (b)<<8 | (a) )
-+# define BT_MAKE_ID(a,b,c,d) ( (int)(d)<<24 | (int)(c)<<16 | (b)<<8 | (a) )
- #endif
-
--#define BT_SOFTBODY_CODE MAKE_ID('S','B','D','Y')
--#define BT_COLLISIONOBJECT_CODE MAKE_ID('C','O','B','J')
--#define BT_RIGIDBODY_CODE MAKE_ID('R','B','D','Y')
--#define BT_CONSTRAINT_CODE MAKE_ID('C','O','N','S')
--#define BT_BOXSHAPE_CODE MAKE_ID('B','O','X','S')
--#define BT_QUANTIZED_BVH_CODE MAKE_ID('Q','B','V','H')
--#define BT_TRIANLGE_INFO_MAP MAKE_ID('T','M','A','P')
--#define BT_SHAPE_CODE MAKE_ID('S','H','A','P')
--#define BT_ARRAY_CODE MAKE_ID('A','R','A','Y')
--#define BT_SBMATERIAL_CODE MAKE_ID('S','B','M','T')
--#define BT_SBNODE_CODE MAKE_ID('S','B','N','D')
--#define BT_DNA_CODE MAKE_ID('D','N','A','1')
-+#define BT_SOFTBODY_CODE BT_MAKE_ID('S','B','D','Y')
-+#define BT_COLLISIONOBJECT_CODE BT_MAKE_ID('C','O','B','J')
-+#define BT_RIGIDBODY_CODE BT_MAKE_ID('R','B','D','Y')
-+#define BT_CONSTRAINT_CODE BT_MAKE_ID('C','O','N','S')
-+#define BT_BOXSHAPE_CODE BT_MAKE_ID('B','O','X','S')
-+#define BT_QUANTIZED_BVH_CODE BT_MAKE_ID('Q','B','V','H')
-+#define BT_TRIANLGE_INFO_MAP BT_MAKE_ID('T','M','A','P')
-+#define BT_SHAPE_CODE BT_MAKE_ID('S','H','A','P')
-+#define BT_ARRAY_CODE BT_MAKE_ID('A','R','A','Y')
-+#define BT_SBMATERIAL_CODE BT_MAKE_ID('S','B','M','T')
-+#define BT_SBNODE_CODE BT_MAKE_ID('S','B','N','D')
-+#define BT_DNA_CODE BT_MAKE_ID('D','N','A','1')
-
-
- struct btPointerUid
Deleted: trunk/blender/extern/bullet2/patches/pvs_warning_fixes.patch
===================================================================
--- trunk/blender/extern/bullet2/patches/pvs_warning_fixes.patch 2013-03-07 17:52:51 UTC (rev 55095)
+++ trunk/blender/extern/bullet2/patches/pvs_warning_fixes.patch 2013-03-07 17:53:16 UTC (rev 55096)
@@ -1,31 +0,0 @@
-Index: extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
-===================================================================
---- extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h (Revision 45907)
-+++ extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h (Revision 45908)
-@@ -45,7 +45,9 @@
- int getTriangleIndex() const
- {
- // Get only the lower bits where the triangle index is stored
-- return (m_PartIdTriangleIndex&~((~0)<<(31-MAX_NUM_PARTS_IN_BITS)));
-+ unsigned int x = 0;
-+ unsigned int y = (~(x&0))<<(31-MAX_NUM_PARTS_IN_BITS);
-+ return (m_PartIdTriangleIndex&~(y));
- }
- int getPartId() const
- {
-Index: extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
-===================================================================
---- extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h (Revision 45907)
-+++ extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h (Revision 45908)
-@@ -78,8 +78,10 @@
- int getTriangleIndex() const
- {
- btAssert(isLeafNode());
-+ unsigned int x=0;
-+ unsigned int y = (~(x&0))<<(31-MAX_NUM_PARTS_IN_BITS);
- // Get only the lower bits where the triangle index is stored
-- return (m_escapeIndexOrTriangleIndex&~((~0)<<(31-MAX_NUM_PARTS_IN_BITS)));
-+ return (m_escapeIndexOrTriangleIndex&~(y));
- }
- int getPartId() const
- {
Modified: trunk/blender/extern/bullet2/readme.txt
===================================================================
--- trunk/blender/extern/bullet2/readme.txt 2013-03-07 17:52:51 UTC (rev 55095)
+++ trunk/blender/extern/bullet2/readme.txt 2013-03-07 17:53:16 UTC (rev 55096)
@@ -7,13 +7,6 @@
Apply patches/ghost_softbody.patch to prevent softbodies being hit by ghost objects.
Originally committed in blender svn revision: 43905.
-Apply patches/pvs_warning_fixes.patch to fix warnings reported by PVS-Studio.
-Originally committed in blender svn revision: 45908.
-
-Apply patches/make_id.patch to prevent duplicated define of MAKE_ID macro in blender
-side and bullet side.
-Sergey
-
Apply patches/ghost_character.patch to prevent characters from colliding with ghost objects.
Mitchell
Modified: trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
===================================================================
--- trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h 2013-03-07 17:52:51 UTC (rev 55095)
+++ trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h 2013-03-07 17:53:16 UTC (rev 55096)
@@ -615,7 +615,7 @@
}
template <typename BP_FP_INT_TYPE>
-void btAxisSweep3Internal<BP_FP_INT_TYPE>::resetPool(btDispatcher* dispatcher)
+void btAxisSweep3Internal<BP_FP_INT_TYPE>::resetPool(btDispatcher* /*dispatcher*/)
{
if (m_numHandles == 0)
{
Modified: trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
===================================================================
--- trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h 2013-03-07 17:52:51 UTC (rev 55095)
+++ trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h 2013-03-07 17:53:16 UTC (rev 55096)
@@ -23,6 +23,7 @@
class btDispatcher;
class btManifoldResult;
class btCollisionObject;
+struct btCollisionObjectWrapper;
struct btDispatcherInfo;
class btPersistentManifold;
@@ -69,7 +70,7 @@
virtual ~btCollisionAlgorithm() {};
- virtual void processCollision (btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut) = 0;
+ virtual void processCollision (const btCollisionObjectWrapper* body0Wrap,const btCollisionObjectWrapper* body1Wrap,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut) = 0;
virtual btScalar calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut) = 0;
Modified: trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
===================================================================
--- trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h 2013-03-07 17:52:51 UTC (rev 55095)
+++ trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h 2013-03-07 17:53:16 UTC (rev 55096)
@@ -57,7 +57,7 @@
// Specific methods implementation
//SSE gives errors on a MSVC 7.1
-#if defined (BT_USE_SSE) && defined (_WIN32)
+#if defined (BT_USE_SSE) //&& defined (_WIN32)
#define DBVT_SELECT_IMPL DBVT_IMPL_SSE
#define DBVT_MERGE_IMPL DBVT_IMPL_SSE
#define DBVT_INT0_IMPL DBVT_IMPL_SSE
@@ -160,6 +160,10 @@
btDbvtAabbMm& r);
DBVT_INLINE friend bool NotEqual( const btDbvtAabbMm& a,
const btDbvtAabbMm& b);
+
+ DBVT_INLINE btVector3& tMins() { return(mi); }
+ DBVT_INLINE btVector3& tMaxs() { return(mx); }
+
private:
DBVT_INLINE void AddSpan(const btVector3& d,btScalar& smi,btScalar& smx) const;
private:
@@ -320,7 +324,7 @@
DBVT_PREFIX
void collideTV( const btDbvtNode* root,
const btDbvtVolume& volume,
- DBVT_IPOLICY);
+ DBVT_IPOLICY) const;
///rayTest is a re-entrant ray test, and can be called in parallel as long as the btAlignedAlloc is thread-safe (uses locking etc)
///rayTest is slower than rayTestInternal, because it builds a local stack, using memory allocations, and it recomputes signs/rayDirectionInverses each time
DBVT_PREFIX
@@ -519,7 +523,11 @@
#if DBVT_INT0_IMPL == DBVT_IMPL_SSE
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list