rename confusing constants (no functional change)
authorCampbell Barton <ideasman42@gmail.com>
Thu, 13 Oct 2011 22:14:41 +0000 (22:14 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 13 Oct 2011 22:14:41 +0000 (22:14 +0000)
- OB_BOUND_POLYT --> OB_BOUND_CONVEX_HULL
- OB_BOUND_POLYH --> OB_BOUND_TRIANGLE_MESH

source/blender/makesdna/DNA_object_types.h
source/blender/makesrna/intern/rna_object.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp

index f0c7cf8cc4596a90b6e794a6b2d7b60d3c310180..6faf86b74a59d71098d696d854f8bf78e4dcb016 100644 (file)
@@ -412,14 +412,14 @@ typedef struct DupliObject {
 #define OB_EMPTY_IMAGE 8
 
 /* boundtype */
-#define OB_BOUND_BOX           0
-#define OB_BOUND_SPHERE                1
-#define OB_BOUND_CYLINDER      2
-#define OB_BOUND_CONE          3
-#define OB_BOUND_POLYH         4
-#define OB_BOUND_POLYT         5
+#define OB_BOUND_BOX           0
+#define OB_BOUND_SPHERE        1
+#define OB_BOUND_CYLINDER      2
+#define OB_BOUND_CONE          3
+#define OB_BOUND_TRIANGLE_MESH 4
+#define OB_BOUND_CONVEX_HULL   5
 /* #define OB_BOUND_DYN_MESH   6 */ /*UNUSED*/
-#define OB_BOUND_CAPSULE       7
+#define OB_BOUND_CAPSULE       7
 
 
 /* **************** BASE ********************* */
index 428599af9778df4160ac89010c9cd16446ec5a35..bbbec3bcf9a89fec252d9ad8cbcea119cea4c7a2 100644 (file)
@@ -83,8 +83,8 @@ static EnumPropertyItem collision_bounds_items[] = {
        {OB_BOUND_SPHERE, "SPHERE", 0, "Sphere", ""},
        {OB_BOUND_CYLINDER, "CYLINDER", 0, "Cylinder", ""},
        {OB_BOUND_CONE, "CONE", 0, "Cone", ""},
-       {OB_BOUND_POLYT, "CONVEX_HULL", 0, "Convex Hull", ""},
-       {OB_BOUND_POLYH, "TRIANGLE_MESH", 0, "Triangle Mesh", ""},
+       {OB_BOUND_CONVEX_HULL, "CONVEX_HULL", 0, "Convex Hull", ""},
+       {OB_BOUND_TRIANGLE_MESH, "TRIANGLE_MESH", 0, "Triangle Mesh", ""},
        {OB_BOUND_CAPSULE, "CAPSULE", 0, "Capsule", ""},
        //{OB_DYN_MESH, "DYNAMIC_MESH", 0, "Dynamic Mesh", ""},
        {0, NULL, 0, NULL, NULL}};
@@ -430,8 +430,8 @@ static EnumPropertyItem *rna_Object_collision_bounds_itemf(bContext *UNUSED(C),
        EnumPropertyItem *item= NULL;
        int totitem= 0;
 
-       RNA_enum_items_add_value(&item, &totitem, collision_bounds_items, OB_BOUND_POLYH);
-       RNA_enum_items_add_value(&item, &totitem, collision_bounds_items, OB_BOUND_POLYT);
+       RNA_enum_items_add_value(&item, &totitem, collision_bounds_items, OB_BOUND_TRIANGLE_MESH);
+       RNA_enum_items_add_value(&item, &totitem, collision_bounds_items, OB_BOUND_CONVEX_HULL);
 
        if(ob->body_type!=OB_BODY_TYPE_SOFT) {
                RNA_enum_items_add_value(&item, &totitem, collision_bounds_items, OB_BOUND_CONE);
@@ -934,9 +934,9 @@ static void rna_GameObjectSettings_physics_type_set(PointerRNA *ptr, int value)
                ob->gameflag &= ~(OB_RIGID_BODY|OB_OCCLUDER|OB_SENSOR|OB_NAVMESH);
 
                /* assume triangle mesh, if no bounds chosen for soft body */
-               if ((ob->gameflag & OB_BOUNDS) && (ob->boundtype<OB_BOUND_POLYH))
+               if ((ob->gameflag & OB_BOUNDS) && (ob->boundtype<OB_BOUND_TRIANGLE_MESH))
                {
-                       ob->boundtype=OB_BOUND_POLYH;
+                       ob->boundtype= OB_BOUND_TRIANGLE_MESH;
                }
                /* create a BulletSoftBody structure if not already existing */
                if (!ob->bsoft)
@@ -1804,7 +1804,7 @@ static void rna_def_object(BlenderRNA *brna)
                {OB_BOUND_SPHERE, "SPHERE", 0, "Sphere", "Draw bounds as sphere"},
                {OB_BOUND_CYLINDER, "CYLINDER", 0, "Cylinder", "Draw bounds as cylinder"},
                {OB_BOUND_CONE, "CONE", 0, "Cone", "Draw bounds as cone"},
-               {OB_BOUND_POLYH, "POLYHEDRON", 0, "Polyhedron", "Draw bounds as polyhedron"},
+               {OB_BOUND_TRIANGLE_MESH, "POLYHEDRON", 0, "Polyhedron", "Draw bounds as polyhedron"},
                {OB_BOUND_CAPSULE, "CAPSULE", 0, "Capsule", "Draw bounds as capsule"},
                {0, NULL, 0, NULL, NULL}};
 
index 8633a14de033c8c3889ef3ea8b21ab5d667a45bd..e6783d7c1061df5fa5991995f1ad3a49603bff3b 100644 (file)
@@ -1590,7 +1590,7 @@ void BL_CreatePhysicsObjectNew(KX_GameObject* gameobj,
                                objprop.m_boundobject.box.m_extends[1]=2.f*bb.m_extends[1];
                                objprop.m_boundobject.box.m_extends[2]=2.f*bb.m_extends[2];
                                break;
-                       case OB_BOUND_POLYT:
+                       case OB_BOUND_CONVEX_HULL:
                                if (blenderobject->type == OB_MESH)
                                {
                                        objprop.m_boundclass = KX_BOUNDPOLYTOPE;
@@ -1598,7 +1598,7 @@ void BL_CreatePhysicsObjectNew(KX_GameObject* gameobj,
                                }
                                // Object is not a mesh... fall through OB_BOUND_POLYH to 
                                // OB_BOUND_SPHERE
-                       case OB_BOUND_POLYH:
+                       case OB_BOUND_TRIANGLE_MESH:
                                if (blenderobject->type == OB_MESH)
                                {
                                        objprop.m_boundclass = KX_BOUNDMESH;