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

Fix GDScript assuming awareness of whole ClassDB

Browse source
This commit is contained in:
Pedro J. Estébanez 2018-10-28 01:58:39 +02:00
parent f39ea99c08
commit 7095a71c02
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/gdscript/gdscript_editor.cpp
View file

@ -1330,7 +1330,12 @@ static bool _guess_identifier_type(const GDScriptCompletionContext &p_context, c
r_type.value = Engine::get_singleton()->get_singleton_object(target_id); r_type.value = Engine::get_singleton()->get_singleton_object(target_id);
} else { } else {
r_type.type.is_meta_type = true; r_type.type.is_meta_type = true;
int idx = GDScriptLanguage::get_singleton()->get_global_map()[target_id]; const Map<StringName, int>::Element *target_elem = GDScriptLanguage::get_singleton()->get_global_map().find(target_id);
// Check because classes like EditorNode are in ClassDB by now, but unknown to GDScript
if (!target_elem) {
return false;
}
int idx = target_elem->get();
r_type.value = GDScriptLanguage::get_singleton()->get_global_array()[idx]; r_type.value = GDScriptLanguage::get_singleton()->get_global_array()[idx];
} }
return true; return true;