godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #52902 from nekomatata/fix-ray-shape-platform-3.x

Browse Source
This commit is contained in:
Rémi Verschelde 2021-09-21 20:25:44 +02:00 committed by GitHub
commit 5b841c182a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scene/2d/physics_body_2d.cpp
View File

@ -1015,6 +1015,7 @@ bool KinematicBody2D::separate_raycast_shapes(bool p_infinite_inertia, Collision
if (deepest != -1) {
r_collision.collider = sep_res[deepest].collider_id;
r_collision.collider_rid = sep_res[deepest].collider;
r_collision.collider_metadata = sep_res[deepest].collider_metadata;
r_collision.collider_shape = sep_res[deepest].collider_shape;
r_collision.collider_vel = sep_res[deepest].collider_velocity;

1
scene/3d/physics_body.cpp
View File

@ -1278,6 +1278,7 @@ bool KinematicBody::separate_raycast_shapes(bool p_infinite_inertia, Collision &
if (deepest != -1) {
r_collision.collider = sep_res[deepest].collider_id;
r_collision.collider_rid = sep_res[deepest].collider;
r_collision.collider_metadata = sep_res[deepest].collider_metadata;
r_collision.collider_shape = sep_res[deepest].collider_shape;
r_collision.collider_vel = sep_res[deepest].collider_velocity;