diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-17 02:25:40 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-17 02:25:40 +0300 |
| commit | 9149e8942107343fb31639406124428e6ff1a029 (patch) | |
| tree | d33495dc55c5d50206437598ddcfffa24843be61 /source/blender/makesdna/DNA_constraint_types.h | |
| parent | ea33b90a1bf21061ab8a862d862db4dea048b28c (diff) | |
| parent | 98f43ba3e4cb0a26eb62ea98e27a313265f8948c (diff) | |
Merge branch 'master' into blende2.8
Diffstat (limited to 'source/blender/makesdna/DNA_constraint_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_constraint_types.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h index a2c756dd197..b68ba8d9a89 100644 --- a/source/blender/makesdna/DNA_constraint_types.h +++ b/source/blender/makesdna/DNA_constraint_types.h @@ -890,10 +890,10 @@ typedef enum eStretchTo_Flags { } eStretchTo_Flags; /* important: these defines need to match up with PHY_DynamicTypes headerfile */ -#define CONSTRAINT_RB_BALL 1 -#define CONSTRAINT_RB_HINGE 2 -#define CONSTRAINT_RB_CONETWIST 4 -#define CONSTRAINT_RB_VEHICLE 11 -#define CONSTRAINT_RB_GENERIC6DOF 12 +#define CONSTRAINT_RB_BALL 1 +#define CONSTRAINT_RB_HINGE 2 +#define CONSTRAINT_RB_CONETWIST 4 +#define CONSTRAINT_RB_VEHICLE 11 +#define CONSTRAINT_RB_GENERIC6DOF 12 #endif |