From c6bec43330be0874b4116d259bbaf9fb90ed0556 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Sat, 29 May 2010 21:31:57 +0000 Subject: 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 --- source/gameengine/Physics/common/PHY_DynamicTypes.h | 1 - 1 file changed, 1 deletion(-) (limited to 'source/gameengine/Physics/common/PHY_DynamicTypes.h') diff --git a/source/gameengine/Physics/common/PHY_DynamicTypes.h b/source/gameengine/Physics/common/PHY_DynamicTypes.h index 4b5cdd41b9a..08d94a2850a 100644 --- a/source/gameengine/Physics/common/PHY_DynamicTypes.h +++ b/source/gameengine/Physics/common/PHY_DynamicTypes.h @@ -138,7 +138,6 @@ typedef enum PHY_ShapeType { PHY_SHAPE_SPHERE, PHY_SHAPE_CYLINDER, PHY_SHAPE_CONE, - PHY_SHAPE_CAPSULE, PHY_SHAPE_MESH, PHY_SHAPE_POLYTOPE, PHY_SHAPE_COMPOUND, -- cgit v1.2.3