From 643b0be4cb3f73bd876493d2a7bd6f76ef27cf06 Mon Sep 17 00:00:00 2001 From: Sergej Reich Date: Thu, 7 Mar 2013 17:53:16 +0000 Subject: 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. --- .../src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h') diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h index a8e7bc22902..0409f95379b 100644 --- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h +++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h @@ -268,7 +268,7 @@ This brings support for limit parameters and motors. */ -class btGeneric6DofConstraint : public btTypedConstraint +ATTRIBUTE_ALIGNED16(class) btGeneric6DofConstraint : public btTypedConstraint { protected: @@ -346,6 +346,8 @@ protected: public: + BT_DECLARE_ALIGNED_ALLOCATOR(); + ///for backwards compatibility during the transition to 'getInfo/getInfo2' bool m_useSolveConstraintObsolete; @@ -354,7 +356,7 @@ public: //! Calcs global transform of the offsets /*! - Calcs the global transform for the joint offset for body A an B, and also calcs the angle differences between the bodies. + Calcs the global transform for the joint offset for body A an B, and also calcs the agle differences between the bodies. \sa btGeneric6DofConstraint.getCalculatedTransformA , btGeneric6DofConstraint.getCalculatedTransformB, btGeneric6DofConstraint.calculateAngleInfo */ void calculateTransforms(const btTransform& transA,const btTransform& transB); -- cgit v1.2.3