diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2010-05-30 01:31:57 +0400 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2010-05-30 01:31:57 +0400 |
| commit | c6bec43330be0874b4116d259bbaf9fb90ed0556 (patch) | |
| tree | a1de833c9b4067a0659461ce8af20857678034ed /source/gameengine/Ketsji/KX_ConvertPhysicsObject.h | |
| parent | 9d3157eed000e7c543d04f5ad3efc5990675903b (diff) | |
reverting previous commit from Mitchell. His commit went to the trunk instead of the branch :)
svn merge -r 29067:29066 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/gameengine/Ketsji/KX_ConvertPhysicsObject.h')
| -rw-r--r-- | source/gameengine/Ketsji/KX_ConvertPhysicsObject.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h index 850bf4b4ad4..879bcd472c6 100644 --- a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h +++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h @@ -53,8 +53,7 @@ typedef enum { KX_BOUNDCONE, KX_BOUNDMESH, KX_BOUNDPOLYTOPE, - KX_BOUND_DYN_MESH, - KX_BOUNDCAPSULE + KX_BOUND_DYN_MESH } KX_BoundBoxClass; struct KX_BoxBounds |