From 982a5cc60dd93b21ce110b3fff831d05720047bf Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Tue, 3 Mar 2009 03:41:24 +0000 Subject: Upgraded to Bullet 2.74. The upgrade introduced a few bugs, which need to be fixed before Blender 2.49. In particular, the Bullet vehicle seems broken, and some soft-body demos don't work. No new features or benefits are added yet, but a few improvements are planned before Blender 2.49 release. Please update the build systems, and add those 3 files: extern/bullet2/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp extern/bullet2/src/BulletCollision/CollisionDispatch/btGhostObject.cpp extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp I'll watch the Blender mailing list, in case this commit causes some issues. --- extern/bullet2/src/BulletCollision/Gimpact/gim_radixsort.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'extern/bullet2/src/BulletCollision/Gimpact/gim_radixsort.h') diff --git a/extern/bullet2/src/BulletCollision/Gimpact/gim_radixsort.h b/extern/bullet2/src/BulletCollision/Gimpact/gim_radixsort.h index 9ecf61bdc6d..f7dadbbca93 100644 --- a/extern/bullet2/src/BulletCollision/Gimpact/gim_radixsort.h +++ b/extern/bullet2/src/BulletCollision/Gimpact/gim_radixsort.h @@ -36,11 +36,7 @@ email: projectileman@yahoo.com #include "gim_memory.h" -/*! \defgroup SORTING -\brief -Macros for sorting. -*/ - +///Macros for sorting. //! Prototype for comparators class less_comparator { @@ -406,5 +402,5 @@ void gim_heap_sort(T *pArr, GUINT element_count, COMP_CLASS CompareFunc) -//! @} + #endif // GIM_RADIXSORT_H_INCLUDED -- cgit v1.2.3