Merge pull request #48591 from trollodel/collisionobject3d-fix-discon…

…nect Use the correct method in shape_owner_remove_shape
godotengine · May 9, 2021 · 87f8feb · 87f8feb
2 parents aac0145 + a24c46e
commit 87f8feb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/scene/3d/collision_object_3d.cpp b/scene/3d/collision_object_3d.cpp
@@ -200,7 +200,7 @@ void CollisionObject3D::_update_shape_data(uint32_t p_owner) {
 	}
 }
 
-void CollisionObject3D::_shape_changed(Ref<Shape3D> p_shape) {
+void CollisionObject3D::_shape_changed(const Ref<Shape3D> &p_shape) {
 	for (Map<uint32_t, ShapeData>::Element *E = shapes.front(); E; E = E->next()) {
 		ShapeData &shapedata = E->get();
 		ShapeData::ShapeBase *shapes = shapedata.shapes.ptrw();
@@ -485,8 +485,8 @@ void CollisionObject3D::shape_owner_remove_shape(uint32_t p_owner, int p_shape)
 
 	if (s.debug_shape.is_valid()) {
 		RS::get_singleton()->free(s.debug_shape);
-		if (s.shape.is_valid() && s.shape->is_connected("changed", callable_mp(this, &CollisionObject3D::_update_shape_data))) {
-			s.shape->disconnect("changed", callable_mp(this, &CollisionObject3D::_update_shape_data));
+		if (s.shape.is_valid() && s.shape->is_connected("changed", callable_mp(this, &CollisionObject3D::_shape_changed))) {
+			s.shape->disconnect("changed", callable_mp(this, &CollisionObject3D::_shape_changed));
 		}
 		--debug_shapes_count;
 	}

diff --git a/scene/3d/collision_object_3d.h b/scene/3d/collision_object_3d.h
@@ -72,7 +72,7 @@ class CollisionObject3D : public Node3D {
 
 	bool _are_collision_shapes_visible();
 	void _update_shape_data(uint32_t p_owner);
-	void _shape_changed(Ref<Shape3D> p_shape);
+	void _shape_changed(const Ref<Shape3D> &p_shape);
 	void _update_debug_shapes();
 	void _clear_debug_shapes();