asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #39468 from KoBeWi/cpp_type_the_sequel

Browse source 
Fix custom types in node list search
This commit is contained in:
Rémi Verschelde 2020-06-12 10:46:21 +02:00 committed by GitHub
commit 42bc9ba92f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
editor/create_dialog.cpp
View file

@ -347,20 +347,22 @@ void CreateDialog::_update_search() {
} else { } else {
bool found = false; bool found = false;
String type2 = type; String type2 = type;
bool cpp_type2 = cpp_type;
if (!cpp_type && !search_loaded_scripts.has(type)) { if (!cpp_type && !search_loaded_scripts.has(type)) {
search_loaded_scripts[type] = ed.script_class_load_script(type); search_loaded_scripts[type] = ed.script_class_load_script(type);
} }
while (type2 != "" && (cpp_type ? ClassDB::is_parent_class(type2, base_type) : ed.script_class_is_parent(type2, base_type)) && type2 != base_type) { while (type2 != "" && (cpp_type2 ? ClassDB::is_parent_class(type2, base_type) : ed.script_class_is_parent(type2, base_type)) && type2 != base_type) {
if (search_box->get_text().is_subsequence_ofi(type2)) { if (search_box->get_text().is_subsequence_ofi(type2)) {
found = true; found = true;
break; break;
} }
type2 = cpp_type ? ClassDB::get_parent_class(type2) : ed.script_class_get_base(type2); type2 = cpp_type2 ? ClassDB::get_parent_class(type2) : ed.script_class_get_base(type2);
cpp_type2 = cpp_type2 || ClassDB::class_exists(type2); // Built-in class can't inherit from custom type, so we can skip the check if it's already true.
if (!cpp_type && !search_loaded_scripts.has(type2)) { if (!cpp_type2 && !search_loaded_scripts.has(type2)) {
search_loaded_scripts[type2] = ed.script_class_load_script(type2); search_loaded_scripts[type2] = ed.script_class_load_script(type2);
} }
} }