diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-04-23 05:02:25 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-04-23 05:02:25 +0300 |
commit | 101ec2f3b814b6cc03e550ca0d0987d11b0847ca (patch) | |
tree | 86be22d4a6e0b8b8c8ed9214f2add4e4a73aef5b /source/blender/makesdna | |
parent | f6f4ab3ebfe4772dcc0a47a2f54121017d5181d1 (diff) | |
parent | c3accabef9097c2657e9407c2ef9c9d994c008c3 (diff) |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_rigidbody_types.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/makesdna/DNA_rigidbody_types.h b/source/blender/makesdna/DNA_rigidbody_types.h index 5c514ef04e1..7ae97187c25 100644 --- a/source/blender/makesdna/DNA_rigidbody_types.h +++ b/source/blender/makesdna/DNA_rigidbody_types.h @@ -306,28 +306,28 @@ typedef enum eRigidBodyCon_Type { /** lets bodies rotate around a specified point */ RBC_TYPE_POINT = 0, /** lets bodies rotate around a specified axis */ - RBC_TYPE_HINGE, + RBC_TYPE_HINGE = 1, /** simulates wheel suspension */ - /* RBC_TYPE_HINGE2, */ /* UNUSED */ + /* RBC_TYPE_HINGE2 = 2, */ /* UNUSED */ /** restricts movent to a specified axis */ - RBC_TYPE_SLIDER, + RBC_TYPE_SLIDER = 3, /** lets object rotate within a specified cone */ - /* RBC_TYPE_CONE_TWIST, */ /* UNUSED */ + /* RBC_TYPE_CONE_TWIST = 4, */ /* UNUSED */ /** allows user to specify constraint axes */ - RBC_TYPE_6DOF, + RBC_TYPE_6DOF = 5, /** like 6DOF but has springs */ - RBC_TYPE_6DOF_SPRING, + RBC_TYPE_6DOF_SPRING = 6, /** simulates a universal joint */ - /* RBC_TYPE_UNIVERSAL, */ /* UNUSED */ + /* RBC_TYPE_UNIVERSAL = 7, */ /* UNUSED */ /** glues two bodies together */ - RBC_TYPE_FIXED, + RBC_TYPE_FIXED = 8, /** similar to slider but also allows rotation around slider axis */ - RBC_TYPE_PISTON, + RBC_TYPE_PISTON = 9, /** Simplified spring constraint with only once axis that's * automatically placed between the connected bodies */ - /* RBC_TYPE_SPRING, */ /* UNUSED */ + /* RBC_TYPE_SPRING = 10, */ /* UNUSED */ /** dirves bodies by applying linear and angular forces */ - RBC_TYPE_MOTOR, + RBC_TYPE_MOTOR = 11, } eRigidBodyCon_Type; /* Spring implementation type for RigidBodyOb */ |