summaryrefslogtreecommitdiff
path: root/servers/physics
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-10-31 23:02:37 +0100
committerGitHub <noreply@github.com>2017-10-31 23:02:37 +0100
commit24b3733f3bc416f62d353d279733cfaab606f918 (patch)
treea7dcab8af1b7d009c4e7a368869c192df14c47d1 /servers/physics
parentca31174dd04e2c19ee36f072ad527fef5059dd90 (diff)
parentfbeb27b01d2dd94c80f9ae8ecf1dfd69a1bb55a6 (diff)
Merge pull request #10770 from RandomShaper/fix-joints
Fix joints collision exceptions, plus a bit more
Diffstat (limited to 'servers/physics')
-rw-r--r--servers/physics/physics_server_sw.cpp14
1 files changed, 0 insertions, 14 deletions
diff --git a/servers/physics/physics_server_sw.cpp b/servers/physics/physics_server_sw.cpp
index a7c31cf16c..5ba935d47c 100644
--- a/servers/physics/physics_server_sw.cpp
+++ b/servers/physics/physics_server_sw.cpp
@@ -233,14 +233,7 @@ void PhysicsServerSW::area_set_space(RID p_area, RID p_space) {
if (area->get_space() == space)
return; //pointless
- for (Set<ConstraintSW *>::Element *E = area->get_constraints().front(); E; E = E->next()) {
- RID self = E->get()->get_self();
- if (!self.is_valid())
- continue;
- free(self);
- }
area->clear_constraints();
-
area->set_space(space);
};
@@ -494,14 +487,7 @@ void PhysicsServerSW::body_set_space(RID p_body, RID p_space) {
if (body->get_space() == space)
return; //pointless
- for (Map<ConstraintSW *, int>::Element *E = body->get_constraint_map().front(); E; E = E->next()) {
- RID self = E->key()->get_self();
- if (!self.is_valid())
- continue;
- free(self);
- }
body->clear_constraint_map();
-
body->set_space(space);
};