diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-01-21 12:52:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-21 12:52:24 +0100 |
| commit | c70ce4d4878be5fa17b94ff2e8a950aa809af6e9 (patch) | |
| tree | 447c279d734d38e940ed4c6293fa82bd2a180c31 /scene | |
| parent | 6f764e6291cc6cfa3c937359d11d81a9f2221056 (diff) | |
| parent | 540ddbc33beb804acde2fbe533a7f832fd2e4c21 (diff) | |
Merge pull request #56124 from KoBeWi/font_slayer
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/gui/control.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index f167062f7d..562ea8a8f7 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -240,7 +240,7 @@ bool Control::_set(const StringName &p_name, const Variant &p_value) { return false; } - if (p_value.get_type() == Variant::NIL) { + if (p_value.get_type() == Variant::NIL || (p_value.get_type() == Variant::OBJECT && (Object *)p_value == nullptr)) { if (name.begins_with("theme_override_icons/") || name.begins_with("custom_icons/")) { String dname = name.get_slicec('/', 1); if (data.icon_override.has(dname)) { |