diff options
Diffstat (limited to 'source/gameengine/Physics/common/PHY_DynamicTypes.h')
| -rw-r--r-- | source/gameengine/Physics/common/PHY_DynamicTypes.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/gameengine/Physics/common/PHY_DynamicTypes.h b/source/gameengine/Physics/common/PHY_DynamicTypes.h index d10f48ad7a4..a92a950b26f 100644 --- a/source/gameengine/Physics/common/PHY_DynamicTypes.h +++ b/source/gameengine/Physics/common/PHY_DynamicTypes.h @@ -4,8 +4,8 @@ Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. @@ -32,7 +32,7 @@ enum PHY_OBJECT_RESPONSE, /* Object Dynamic Geometry Response */ PHY_STATIC_RESPONSE, /* Static Geometry Response */ PHY_BROADPH_RESPONSE, /* broadphase Response */ - + PHY_NUM_RESPONSE }; @@ -58,7 +58,7 @@ typedef enum PHY_PhysicsType { PHY_CONCAVE_RIGIDBODY=16399, PHY_CONVEX_FIXEDBODY=16388,//'collision object' PHY_CONCAVE_FIXEDBODY=16401, - PHY_CONVEX_KINEMATICBODY=16387,// + PHY_CONVEX_KINEMATICBODY=16387,// PHY_CONCAVE_KINEMATICBODY=16400, PHY_CONVEX_PHANTOMBODY=16398, PHY_CONCAVE_PHANTOMBODY=16402 |