summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2021-02-28 14:27:18 +0100
committerGitHub <noreply@github.com>2021-02-28 14:27:18 +0100
commit0e77dc6e924cdf68175f56cb67756bf217e6c4ea (patch)
tree948dddae3e026b8d72c404b8d28cf488dbb7a30a /scene
parenta6ec6521fae92a245c9d395efda01a120a44324d (diff)
parent519e314bea2b1552f317d96efb7c9d0ad268e8bc (diff)
Merge pull request #46475 from RootKiller/fix_joint_collision
Fixed bug that caused collision not to be properly reenabled when joi…
Diffstat (limited to 'scene')
-rw-r--r--scene/3d/physics_joint_3d.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/scene/3d/physics_joint_3d.cpp b/scene/3d/physics_joint_3d.cpp
index 0463bed9d6..ebc57ed477 100644
--- a/scene/3d/physics_joint_3d.cpp
+++ b/scene/3d/physics_joint_3d.cpp
@@ -64,6 +64,7 @@ void Joint3D::_body_exit_tree(const ObjectID &p_body_id) {
void Joint3D::_update_joint(bool p_only_free) {
if (ba.is_valid() && bb.is_valid()) {
PhysicsServer3D::get_singleton()->body_remove_collision_exception(ba, bb);
+ PhysicsServer3D::get_singleton()->body_remove_collision_exception(bb, ba);
}
ba = RID();