svn merge -r 16334:16347 https://svn.blender.org/svnroot/bf-blender/trunk/blender...
authorDaniel Genrich <daniel.genrich@gmx.net>
Wed, 3 Sep 2008 10:55:46 +0000 (10:55 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Wed, 3 Sep 2008 10:55:46 +0000 (10:55 +0000)
commit85deff9c30acb7f40108ef446ccaad7348a1a2c0
tree9b5d2b4d83fdbd87d06d311c5c9beeb5c537cb60
parentde493dacb32744f3c8c3019557dfa48fb6032e21
parentcfa07e8d2bdc0a8db15082a692ce25c2fb010ae6
svn merge -r 16334:16347 https://svn.blender.org/svnroot/bf-blender/trunk/blender + also added missing files from bullet-2.71alpha0 archiv + fixed compile errors
17 files changed:
extern/bullet2/src/Bullet-C-Api.h
extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeContactJoint.cpp
extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeContactJoint.h
extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeJoint.cpp
extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeJoint.h
extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeMacros.h
extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeQuickstepConstraintSolver.cpp
extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeQuickstepConstraintSolver.h
extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeSolverBody.h
extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeTypedJoint.cpp
extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeTypedJoint.h
extern/bullet2/src/BulletDynamics/ConstraintSolver/btSorLcp.cpp
extern/bullet2/src/BulletDynamics/ConstraintSolver/btSorLcp.h
extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp
extern/bullet2/src/LinearMath/btConvexHull.h
extern/bullet2/src/LinearMath/btPoolAllocator.h
extern/bullet2/src/SConscript