Fixed typo (marging --> margin).

panda/src/bullet/bulletBoxShape.cxx

@@ -43,23 +43,23 @@ ptr() const {
 }
 
 ////////////////////////////////////////////////////////////////////
-//     Function: BulletBoxShape::get_half_extents_without_marging
+//     Function: BulletBoxShape::get_half_extents_without_margin
 //       Access: Published
 //  Description:
 ////////////////////////////////////////////////////////////////////
 LVecBase3 BulletBoxShape::
-get_half_extents_without_marging() const {
+get_half_extents_without_margin() const {
 
   return btVector3_to_LVecBase3(_shape->getHalfExtentsWithoutMargin());
 }
 
 ////////////////////////////////////////////////////////////////////
-//     Function: BulletBoxShape::get_half_extents_with_marging
+//     Function: BulletBoxShape::get_half_extents_with_margin
 //       Access: Published
 //  Description:
 ////////////////////////////////////////////////////////////////////
 LVecBase3 BulletBoxShape::
-get_half_extents_with_marging() const {
+get_half_extents_with_margin() const {
 
   return btVector3_to_LVecBase3(_shape->getHalfExtentsWithMargin());
 }

panda/src/bullet/bulletBoxShape.h

@@ -34,8 +34,8 @@ PUBLISHED:
   BulletBoxShape(const LVecBase3 &halfExtents);
   INLINE ~BulletBoxShape();
 
-  LVecBase3 get_half_extents_without_marging() const;
-  LVecBase3 get_half_extents_with_marging() const;
+  LVecBase3 get_half_extents_without_margin() const;
+  LVecBase3 get_half_extents_with_margin() const;
 
   static BulletBoxShape *make_from_solid(const CollisionBox *solid);
 

panda/src/bullet/bulletCylinderShape.I

@@ -35,23 +35,23 @@ get_radius() const {
 }
 
 ////////////////////////////////////////////////////////////////////
-//     Function: BulletCylinderShape::get_half_extents_without_marging
+//     Function: BulletCylinderShape::get_half_extents_without_margin
 //       Access: Published
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE LVecBase3 BulletCylinderShape::
-get_half_extents_without_marging() const {
+get_half_extents_without_margin() const {
 
   return btVector3_to_LVecBase3(_shape->getHalfExtentsWithoutMargin());
 }
 
 ////////////////////////////////////////////////////////////////////
-//     Function: BulletCylinderShape::get_half_extents_with_marging
+//     Function: BulletCylinderShape::get_half_extents_with_margin
 //       Access: Published
 //  Description:
 ////////////////////////////////////////////////////////////////////
 INLINE LVecBase3 BulletCylinderShape::
-get_half_extents_with_marging() const {
+get_half_extents_with_margin() const {
 
   return btVector3_to_LVecBase3(_shape->getHalfExtentsWithMargin());
 }

panda/src/bullet/bulletCylinderShape.h

@@ -33,8 +33,8 @@ PUBLISHED:
   INLINE ~BulletCylinderShape();
 
   INLINE PN_stdfloat get_radius() const;
-  INLINE LVecBase3 get_half_extents_without_marging() const;
-  INLINE LVecBase3 get_half_extents_with_marging() const;
+  INLINE LVecBase3 get_half_extents_without_margin() const;
+  INLINE LVecBase3 get_half_extents_with_margin() const;
 
 public:
   virtual btCollisionShape *ptr() const;