Merge pull request #10365 from RandomShaper/fix-10074

Keep shapes bound to out-of-tree 3D physics objects
godotengine · Aug 16, 2017 · 603b262 · 603b262
2 parents 6380975 + 22daecf
commit 603b262
Showing 1 changed file with 0 additions and 7 deletions.
diff --git 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);