BGE patch: new Physics button and margin parameter in Logic panel. Change subversion.

[blender-staging.git] / source / blender / makesdna / DNA_object_types.h

diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index d258cf77ef562cff54d3eeb30d389a1ed8a2729c..3708db3fd38fa57bf13c598340f86f792f346b03 100644 (file)
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -156,7 +156,9 @@ typedef struct Object {
 
        float formfactor;
        float rdamping, sizefac;
-       
+       float margin, pad3;
+
+
        char dt, dtx;
        char totcol;    /* copy of mesh or curve or meta */
        char actcol;    /* currently selected material in the user interface */
@@ -427,6 +429,8 @@ extern Object workob;
 #define OB_PROP                        16384
 #define OB_MAINACTOR   32768
 
+#define OB_PHYSICS             65536
+
 /* ob->gameflag2 */
 #define OB_NEVER_DO_ACTIVITY_CULLING   1