diff options
| author | George Marques <george@gmarqu.es> | 2018-05-08 23:58:27 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-08 23:58:27 -0300 |
| commit | cf4a506cf1327c8233256f7769077dce2a985288 (patch) | |
| tree | eb1b80e1c36ce5b2381e005763a07659b9b47559 | |
| parent | e744d12e568c22d2f260eee15fc9b2cade3dcdd8 (diff) | |
| parent | e64bbcc4297af70e8e889026b856f9322082b667 (diff) | |
Merge pull request #18729 from marcelofg55/bind_enums
Fix some enums missing its bind
| -rw-r--r-- | modules/csg/csg_shape.cpp | 6 | ||||
| -rw-r--r-- | scene/3d/physics_body.cpp | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/modules/csg/csg_shape.cpp b/modules/csg/csg_shape.cpp index 1f2f12f54d..22bc79ef43 100644 --- a/modules/csg/csg_shape.cpp +++ b/modules/csg/csg_shape.cpp @@ -389,9 +389,9 @@ void CSGShape::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::BOOL, "use_collision"), "set_use_collision", "is_using_collision"); ADD_PROPERTY(PropertyInfo(Variant::REAL, "snap", PROPERTY_HINT_RANGE, "0.0001,1,0.001"), "set_snap", "get_snap"); - BIND_CONSTANT(OPERATION_UNION); - BIND_CONSTANT(OPERATION_INTERSECTION); - BIND_CONSTANT(OPERATION_SUBTRACTION); + BIND_ENUM_CONSTANT(OPERATION_UNION); + BIND_ENUM_CONSTANT(OPERATION_INTERSECTION); + BIND_ENUM_CONSTANT(OPERATION_SUBTRACTION); } CSGShape::CSGShape() { diff --git a/scene/3d/physics_body.cpp b/scene/3d/physics_body.cpp index 4528799985..5512fd4f10 100644 --- a/scene/3d/physics_body.cpp +++ b/scene/3d/physics_body.cpp @@ -1922,6 +1922,13 @@ void PhysicalBone::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::REAL, "friction", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_friction", "get_friction"); ADD_PROPERTY(PropertyInfo(Variant::REAL, "bounce", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_bounce", "get_bounce"); ADD_PROPERTY(PropertyInfo(Variant::REAL, "gravity_scale", PROPERTY_HINT_RANGE, "-10,10,0.01"), "set_gravity_scale", "get_gravity_scale"); + + BIND_ENUM_CONSTANT(JOINT_TYPE_NONE); + BIND_ENUM_CONSTANT(JOINT_TYPE_PIN); + BIND_ENUM_CONSTANT(JOINT_TYPE_CONE); + BIND_ENUM_CONSTANT(JOINT_TYPE_HINGE); + BIND_ENUM_CONSTANT(JOINT_TYPE_SLIDER); + BIND_ENUM_CONSTANT(JOINT_TYPE_6DOF); } Skeleton *PhysicalBone::find_skeleton_parent(Node *p_parent) { |