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

Merge pull request #45167 from madmiraal/fix-44703

Browse Source 
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:03 +01:00 committed by GitHub
commit 156d700f00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scene/3d/physics_joint_3d.cpp
View File

@ -114,21 +114,23 @@ void Joint3D::_update_joint(bool p_only_free) {
return; return;
} }
if (!body_a) {
SWAP(body_a, body_b);
}
warning = String(); warning = String();
update_configuration_warning(); 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."); ERR_FAIL_COND_MSG(!joint.is_valid(), "Failed to configure the joint.");
PhysicsServer3D::get_singleton()->joint_set_solver_priority(joint, solver_priority); PhysicsServer3D::get_singleton()->joint_set_solver_priority(joint, solver_priority);
ba = body_a->get_rid(); if (body_a) {
body_a->connect(SceneStringNames::get_singleton()->tree_exiting, callable_mp(this, &Joint3D::_body_exit_tree), make_binds(body_a->get_instance_id())); ba = body_a->get_rid();
body_a->connect(SceneStringNames::get_singleton()->tree_exiting, callable_mp(this, &Joint3D::_body_exit_tree), make_binds(body_a->get_instance_id()));
}
if (body_b) { if (body_b) {
bb = body_b->get_rid(); bb = body_b->get_rid();