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

Merge pull request #45168 from madmiraal/fix-44703-3.2 

[3.2] Fix not clearing a Joint3D with only a B node when removing the B node
This commit is contained in:
Rémi Verschelde 2021-01-14 08:26:32 +01:00 committed by GitHub
parent f93c2ddc92 b651db999c
commit a329de566c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scene/3d/physics_joint.cpp
View File

@ -112,21 +112,22 @@ void Joint::_update_joint(bool p_only_free) {
return;
}
if (!body_a) {
SWAP(body_a, body_b);
}
warning = String();
update_configuration_warning();
joint = _configure_joint(body_a, body_b);
if (body_a)
joint = _configure_joint(body_a, body_b);
else if (body_b)
joint = _configure_joint(body_b, nullptr);
ERR_FAIL_COND_MSG(!joint.is_valid(), "Failed to configure the joint.");
PhysicsServer::get_singleton()->joint_set_solver_priority(joint, solver_priority);
ba = body_a->get_rid();
body_a->connect(SceneStringNames::get_singleton()->tree_exiting, this, SceneStringNames::get_singleton()->_body_exit_tree, make_binds(body_a->get_instance_id()));
if (body_a) {
ba = body_a->get_rid();
body_a->connect(SceneStringNames::get_singleton()->tree_exiting, this, SceneStringNames::get_singleton()->_body_exit_tree, make_binds(body_a->get_instance_id()));
}
if (body_b) {
bb = body_b->get_rid();