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

Properly reset collision exception when releasing Joint2D

Browse Source 
Now using joint_disable_collisions_between_bodies() to reset the exception, because body_remove_collision_exception() was doing only a part of the work.

Fixes #32733
This commit is contained in:
PouleyKetchoupp 2019-10-17 19:22:41 +02:00
parent 26bbb26738
commit 0de76cc647
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scene/2d/joints_2d.cpp
View File

@ -37,8 +37,8 @@
void Joint2D::_update_joint(bool p_only_free) { void Joint2D::_update_joint(bool p_only_free) {
if (joint.is_valid()) { if (joint.is_valid()) {
if (ba.is_valid() && bb.is_valid()) if (ba.is_valid() && bb.is_valid() && exclude_from_collision)
Physics2DServer::get_singleton()->body_remove_collision_exception(ba, bb); Physics2DServer::get_singleton()->joint_disable_collisions_between_bodies(joint, false);
Physics2DServer::get_singleton()->free(joint); Physics2DServer::get_singleton()->free(joint);
joint = RID(); joint = RID();
@ -133,6 +133,8 @@ void Joint2D::set_exclude_nodes_from_collision(bool p_enable) {
if (exclude_from_collision == p_enable) if (exclude_from_collision == p_enable)
return; return;
_update_joint(true);
exclude_from_collision = p_enable; exclude_from_collision = p_enable;
_update_joint(); _update_joint();
} }