diff options
| author | Ricardo Buring <ricardo.buring@gmail.com> | 2023-03-23 19:13:24 +0100 |
|---|---|---|
| committer | Yuri Sizov <yuris@humnom.net> | 2023-03-27 17:53:34 +0200 |
| commit | 9573574788b0ab4b5707aaba34a81110864748e6 (patch) | |
| tree | 088a3b803f860f6cf47dbd8d90257d8b3b83cd31 /scene/3d | |
| parent | 58d8368481813398aab77717a59461c3b79e3a2d (diff) | |
Port robust signal (dis)connection to ShapeCast2D
Ported from ShapeCast3D.
(cherry picked from commit 5bed055cdd5180b4c5d07f07a2a58644a3d1ffc2)
Diffstat (limited to 'scene/3d')
| -rw-r--r-- | scene/3d/shape_cast_3d.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scene/3d/shape_cast_3d.cpp b/scene/3d/shape_cast_3d.cpp index d880e422f0..602eb664dd 100644 --- a/scene/3d/shape_cast_3d.cpp +++ b/scene/3d/shape_cast_3d.cpp @@ -331,16 +331,14 @@ void ShapeCast3D::set_shape(const Ref<Shape3D> &p_shape) { if (p_shape == shape) { return; } - if (!shape.is_null()) { + if (shape.is_valid()) { shape->disconnect(CoreStringNames::get_singleton()->changed, callable_mp(this, &ShapeCast3D::_shape_changed)); shape->unregister_owner(this); } shape = p_shape; - if (!shape.is_null()) { + if (shape.is_valid()) { shape->register_owner(this); shape->connect(CoreStringNames::get_singleton()->changed, callable_mp(this, &ShapeCast3D::_shape_changed)); - } - if (p_shape.is_valid()) { shape_rid = shape->get_rid(); } |