hertog/godot-module-template
Template
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #105942 from PhairZ/isthisoptimization-evenworthit

Browse source 
Make `script_class_get_icon_path()` return any value when `r_valid` is passed.
This commit is contained in:
Thaddeus Crews 2025-05-13 16:22:19 -05:00
commit 74b466ac29
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
editor/editor_data.cpp
View file

@ -1024,10 +1024,12 @@ String EditorData::script_class_get_icon_path(const String &p_class, bool *r_val
}
HashMap<StringName, String>::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);
}