godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8339 from karroffel/gdnative-reload-fix 

[GDNative] Didn't iterate over all scripts
This commit is contained in:
Rémi Verschelde 2017-04-10 08:53:49 +02:00 committed by GitHub
parent 8764659234 0486645c39
commit 5598040e43
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/gdnative/gdnative.cpp
View File

@ -1167,27 +1167,25 @@ void GDNativeReloadNode::_notification(int p_what) {
// update placeholders (if any) // update placeholders (if any)
GDNativeScript *script = NULL; Set<GDNativeScript *> scripts;
for (Set<GDNativeScript *>::Element *S = GDNativeScriptLanguage::get_singleton()->script_list.front(); S; S = S->next()) { for (Set<GDNativeScript *>::Element *S = GDNativeScriptLanguage::get_singleton()->script_list.front(); S; S = S->next()) {
if (lib->native_library->scripts.has(S->get()->get_script_name())) { if (lib->native_library->scripts.has(S->get()->get_script_name())) {
script = S->get(); GDNativeScript *script = S->get();
script->script_data = lib->get_script_data(script->get_script_name()); script->script_data = lib->get_script_data(script->get_script_name());
break; scripts.insert(script);
} }
} }
if (script == NULL) { for (Set<GDNativeScript *>::Element *S = scripts.front(); S; S = S->next()) {
// new class, cool. Nothing to do here GDNativeScript *script = S->get();
continue; if (script->placeholders.size() == 0)
} continue;
if (script->placeholders.size() == 0) for (Set<PlaceHolderScriptInstance *>::Element *P = script->placeholders.front(); P; P = P->next()) {
continue; PlaceHolderScriptInstance *p = P->get();
script->_update_placeholder(p);
for (Set<PlaceHolderScriptInstance *>::Element *P = script->placeholders.front(); P; P = P->next()) { }
PlaceHolderScriptInstance *p = P->get();
script->_update_placeholder(p);
} }
} }