From 9eea6635879cd583f24f1ccde67cdb258fadba4e Mon Sep 17 00:00:00 2001
From: enn0x <ralf.pfrogner@gmx.net>
Date: Wed, 11 Jan 2012 20:35:45 +0000
Subject: [PATCH] Fixed typo (marging --> margin).

---
 panda/src/bullet/bulletBoxShape.cxx    | 8 ++++----
 panda/src/bullet/bulletBoxShape.h      | 4 ++--
 panda/src/bullet/bulletCylinderShape.I | 8 ++++----
 panda/src/bullet/bulletCylinderShape.h | 4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/panda/src/bullet/bulletBoxShape.cxx b/panda/src/bullet/bulletBoxShape.cxx
index de165e0aff..6f8bec8a7d 100644
--- a/panda/src/bullet/bulletBoxShape.cxx
+++ b/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());
 }
diff --git a/panda/src/bullet/bulletBoxShape.h b/panda/src/bullet/bulletBoxShape.h
index f38265a72c..73602e2c40 100644
--- a/panda/src/bullet/bulletBoxShape.h
+++ b/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);
 
diff --git a/panda/src/bullet/bulletCylinderShape.I b/panda/src/bullet/bulletCylinderShape.I
index 419f839f14..9da6a3e386 100644
--- a/panda/src/bullet/bulletCylinderShape.I
+++ b/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());
 }
diff --git a/panda/src/bullet/bulletCylinderShape.h b/panda/src/bullet/bulletCylinderShape.h
index c3566cd3fe..86512b565c 100644
--- a/panda/src/bullet/bulletCylinderShape.h
+++ b/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;