update Bullet 2.x with latest changes, notice that the integration is not finished...
[blender.git] / extern / bullet2 / src / BulletCollision / CollisionShapes / btCompoundShape.h
index 65a6809d4ff82ed9b0bbab91084b1fde2519adaa..c810a654834324943def9db70f14e68535d952a9 100644 (file)
@@ -46,7 +46,7 @@ public:
 
        int             getNumChildShapes() const
        {
-               return m_childShapes.size();
+               return int (m_childShapes.size());
        }
 
        btCollisionShape* getChildShape(int index)