diff options
| author | Ignacio Etcheverry <neikeq@users.noreply.github.com> | 2016-12-10 16:26:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-10 16:26:05 +0100 |
| commit | 043ece3e11825653d71b61590732aa8239f34aa3 (patch) | |
| tree | da4c299a5b9c902623a538fa775d3a2537303993 | |
| parent | c3886e89cb399ec828d1cf646f983da9b92a3f8a (diff) | |
| parent | d579d0a8148f7ce62e320a09fd2e78c430dad530 (diff) | |
Merge pull request #7275 from neikeq/pr-wrong-bind
KinematicBody: Fix wrong method bind return type
| -rw-r--r-- | scene/2d/physics_body_2d.cpp | 2 | ||||
| -rw-r--r-- | scene/3d/physics_body.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scene/2d/physics_body_2d.cpp b/scene/2d/physics_body_2d.cpp index 0c5c353766..b973eab22a 100644 --- a/scene/2d/physics_body_2d.cpp +++ b/scene/2d/physics_body_2d.cpp @@ -1394,7 +1394,7 @@ void KinematicBody2D::_bind_methods() { ObjectTypeDB::bind_method(_MD("get_collision_pos"),&KinematicBody2D::get_collision_pos); ObjectTypeDB::bind_method(_MD("get_collision_normal"),&KinematicBody2D::get_collision_normal); ObjectTypeDB::bind_method(_MD("get_collider_velocity"),&KinematicBody2D::get_collider_velocity); - ObjectTypeDB::bind_method(_MD("get_collider:Object"),&KinematicBody2D::_get_collider); + ObjectTypeDB::bind_method(_MD("get_collider:Variant"),&KinematicBody2D::_get_collider); ObjectTypeDB::bind_method(_MD("get_collider_shape"),&KinematicBody2D::get_collider_shape); ObjectTypeDB::bind_method(_MD("get_collider_metadata:Variant"),&KinematicBody2D::get_collider_metadata); ObjectTypeDB::bind_method(_MD("get_move_and_slide_colliders"),&KinematicBody2D::get_move_and_slide_colliders); diff --git a/scene/3d/physics_body.cpp b/scene/3d/physics_body.cpp index 116f967bd2..ced6cdc94f 100644 --- a/scene/3d/physics_body.cpp +++ b/scene/3d/physics_body.cpp @@ -1304,7 +1304,7 @@ void KinematicBody::_bind_methods() { ObjectTypeDB::bind_method(_MD("get_collision_pos"),&KinematicBody::get_collision_pos); ObjectTypeDB::bind_method(_MD("get_collision_normal"),&KinematicBody::get_collision_normal); ObjectTypeDB::bind_method(_MD("get_collider_velocity"),&KinematicBody::get_collider_velocity); - ObjectTypeDB::bind_method(_MD("get_collider:Object"),&KinematicBody::_get_collider); + ObjectTypeDB::bind_method(_MD("get_collider:Variant"),&KinematicBody::_get_collider); ObjectTypeDB::bind_method(_MD("get_collider_shape"),&KinematicBody::get_collider_shape); |