summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-08-31 16:59:01 +0200
committerGitHub <noreply@github.com>2017-08-31 16:59:01 +0200
commit5fac1406fd8b47d5cd7825c1ab5a8a0882a59a9e (patch)
tree2328853fcef130c0b52662e25d57ea8d7981f4fe
parent5653477a30ca36c59a0d9c8bcb4b3a27a0feca21 (diff)
parent6fc5d1cd370bc16e9e4fd50733393497211f86b6 (diff)
Merge pull request #10818 from Jellonator/master
Fixed incorrect KinematicBody::_move normal return
-rw-r--r--scene/3d/physics_body.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/scene/3d/physics_body.cpp b/scene/3d/physics_body.cpp
index a0a393e8ed..9590394211 100644
--- a/scene/3d/physics_body.cpp
+++ b/scene/3d/physics_body.cpp
@@ -918,7 +918,7 @@ Dictionary KinematicBody::_move(const Vector3 &p_motion) {
if (move(p_motion, col)) {
Dictionary d;
d["position"] = col.collision;
- d["normal"] = col.collision;
+ d["normal"] = col.normal;
d["local_shape"] = col.local_shape;
d["travel"] = col.travel;
d["remainder"] = col.remainder;
@@ -929,6 +929,7 @@ Dictionary KinematicBody::_move(const Vector3 &p_motion) {
d["collider"] = Variant();
}
+ d["collider_velocity"] = col.collider_vel;
d["collider_shape_index"] = col.collider_shape;
d["collider_metadata"] = col.collider_metadata;