godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

Fix freeze on close of game using 2D physics introduced by #9832

Browse Source 
Additionally, port the fix to 3D physics, just in case
This commit is contained in:
Bojidar Marinov
2017-08-08 23:17:11 +03:00
parent 1939e83a65
commit fe1c3349e5
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
servers/physics/physics_server_sw.cpp
View File

@@ -493,8 +493,8 @@ void PhysicsServerSW::body_set_space(RID p_body, RID p_space) {
if (body->get_space() == space) if (body->get_space() == space)
return; //pointless return; //pointless
while (body->get_constraint_map().size()) { for (Map<ConstraintSW *, int>::Element *E = body->get_constraint_map().front(); E; E = E->next()) {
RID self = body->get_constraint_map().front()->key()->get_self(); RID self = E->key()->get_self();
if (!self.is_valid()) if (!self.is_valid())
continue; continue;
free(self); free(self);

4
servers/physics_2d/physics_2d_server_sw.cpp
View File

@@ -548,8 +548,8 @@ void Physics2DServerSW::body_set_space(RID p_body, RID p_space) {
if (body->get_space() == space) if (body->get_space() == space)
return; //pointless return; //pointless
while (body->get_constraint_map().size()) { for (Map<Constraint2DSW *, int>::Element *E = body->get_constraint_map().front(); E; E = E->next()) {
RID self = body->get_constraint_map().front()->key()->get_self(); RID self = E->key()->get_self();
if (!self.is_valid()) if (!self.is_valid())
continue; continue;
free(self); free(self);