diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-08-15 21:22:08 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-15 21:22:08 -0300 |
| commit | 603b262d9bfe757e4a009a80f1c80230d35512ba (patch) | |
| tree | 5aa1cad322550320e2ddb31160a65927155934b1 /scene | |
| parent | 6380975ee277db907c52a9aa621c01281b5c12d4 (diff) | |
| parent | 22daecfbe9232fe5dfe3577670127f9749fd85ef (diff) | |
Merge pull request #10365 from RandomShaper/fix-10074
Keep shapes bound to out-of-tree 3D physics objects
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/3d/collision_shape.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/scene/3d/collision_shape.cpp b/scene/3d/collision_shape.cpp index 4fd215bd1a..2aa6a95718 100644 --- a/scene/3d/collision_shape.cpp +++ b/scene/3d/collision_shape.cpp @@ -89,13 +89,6 @@ void CollisionShape::_notification(int p_what) { parent->shape_owner_set_transform(owner_id, get_transform()); } } break; - case NOTIFICATION_EXIT_TREE: { - if (parent) { - parent->remove_shape_owner(owner_id); - } - owner_id = 0; - parent = NULL; - } break; case NOTIFICATION_UNPARENTED: { if (parent) { parent->remove_shape_owner(owner_id); |