diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2009-03-03 06:41:24 +0300 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2009-03-03 06:41:24 +0300 |
| commit | 982a5cc60dd93b21ce110b3fff831d05720047bf (patch) | |
| tree | 5d6245b0006f249c48e900b748aedd4484c10da3 /extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.cpp | |
| parent | f8ef887880ac217cc831b2ab9677e1f9e825537b (diff) | |
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.
Diffstat (limited to 'extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.cpp')
| -rw-r--r-- | extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.cpp b/extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.cpp index ef6feabdfee..74d734146a7 100644 --- a/extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.cpp +++ b/extern/bullet2/src/BulletCollision/Gimpact/gim_tri_collision.cpp @@ -38,7 +38,7 @@ email: projectileman@yahoo.com #define MIN_EDGE_EDGE_DIS 0.00001f -class _GIM_TRIANGLE_CALCULATION_CACHE +class GIM_TRIANGLE_CALCULATION_CACHE { public: GREAL margin; @@ -489,7 +489,7 @@ public: }; -/*class _GIM_TRIANGLE_CALCULATION_CACHE +/*class GIM_TRIANGLE_CALCULATION_CACHE { public: GREAL margin; @@ -627,7 +627,7 @@ bool GIM_TRIANGLE::collide_triangle_hard_test( const GIM_TRIANGLE & other, GIM_TRIANGLE_CONTACT_DATA & contact_data) const { - _GIM_TRIANGLE_CALCULATION_CACHE calc_cache; + GIM_TRIANGLE_CALCULATION_CACHE calc_cache; return calc_cache.triangle_collision( m_vertices[0],m_vertices[1],m_vertices[2],m_margin, other.m_vertices[0],other.m_vertices[1],other.m_vertices[2],other.m_margin, |