From 1ec1ba6d940ce7b8f4448571acee94d6e75068ea Mon Sep 17 00:00:00 2001 From: PhairZ Date: Wed, 30 Apr 2025 15:42:29 +0300 Subject: [PATCH] Make script_class_get_icon_path() return any value when r_valid is passed. --- editor/editor_data.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/editor/editor_data.cpp b/editor/editor_data.cpp index a8f4b5b434..5bbc4b6ea8 100644 --- a/editor/editor_data.cpp +++ b/editor/editor_data.cpp @@ -1024,10 +1024,12 @@ String EditorData::script_class_get_icon_path(const String &p_class, bool *r_val } HashMap::ConstIterator E = _script_class_icon_paths.find(current); if ((bool)E) { - if (r_valid && !E->value.is_empty()) { - *r_valid = true; + if (r_valid) { + *r_valid = !E->value.is_empty(); + return E->value; + } else if (!E->value.is_empty()) { + return E->value; } - return E->value; } current = ScriptServer::get_global_class_base(current); }