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

Merge pull request #23639 from neikeq/gg

Browse source 
Fix GDScript placeholder fallback
This commit is contained in:
Rémi Verschelde 2018-11-10 21:33:19 +01:00 committed by GitHub
commit 87d27e1250
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/script_language.cpp
View file

@ -563,7 +563,8 @@ Variant PlaceHolderScriptInstance::property_get_fallback(const StringName &p_nam
PlaceHolderScriptInstance::PlaceHolderScriptInstance(ScriptLanguage *p_language, Ref<Script> p_script, Object *p_owner) : PlaceHolderScriptInstance::PlaceHolderScriptInstance(ScriptLanguage *p_language, Ref<Script> p_script, Object *p_owner) :
owner(p_owner), owner(p_owner),
language(p_language), language(p_language),
script(p_script) { script(p_script),
build_failed(false) {
} }
PlaceHolderScriptInstance::~PlaceHolderScriptInstance() { PlaceHolderScriptInstance::~PlaceHolderScriptInstance() {

7
modules/gdscript/gdscript.cpp
View file

@ -469,8 +469,15 @@ bool GDScript::_update_exports() {
for (Set<PlaceHolderScriptInstance *>::Element *E = placeholders.front(); E; E = E->next()) { for (Set<PlaceHolderScriptInstance *>::Element *E = placeholders.front(); E; E = E->next()) {
E->get()->set_build_failed(true); E->get()->set_build_failed(true);
} }
return false;
} }
} else { } else {
if (!valid) {
for (Set<PlaceHolderScriptInstance *>::Element *E = placeholders.front(); E; E = E->next()) {
E->get()->set_build_failed(true);
}
return false;
}
} }
if (base_cache.is_valid()) { if (base_cache.is_valid()) {