godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Fix GDScript placeholder fallback

Browse Source
This commit is contained in:
Ignacio Etcheverry
2018-11-10 20:06:17 +01:00
parent 0f3fc93070
commit 7c4c646749
2 changed files with 9 additions and 1 deletions
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()) {