diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2006-10-31 21:19:57 +0300 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2006-10-31 21:19:57 +0300 |
| commit | 92fd0433463695bff37167a03e1fd87921368955 (patch) | |
| tree | 184bd01d47b1fcd0eea144c4a46b1f40520625db /extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h | |
| parent | 35d6c6e695351051febf7d6aa84761db1d733295 (diff) | |
update Bullet 2.x with latest changes, notice that the integration is not finished yet, and GameBlender is still using extern/bullet.
Diffstat (limited to 'extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h')
| -rw-r--r-- | extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h index 8db1580e41e..b1baca9ff15 100644 --- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h +++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h @@ -45,7 +45,7 @@ class btUnionFind inline int getNumElements() const { - return m_elements.size(); + return int(m_elements.size()); } inline bool isRoot(int x) const { |