Skip to content

Commit cb3af5a

Browse files
committed
Merge pull request #94013 from KoBeWi/scrleanup
Misc script editor code cleanup
2 parents a7bf615 + 8943260 commit cb3af5a

File tree

3 files changed

+3
-18
lines changed

3 files changed

+3
-18
lines changed

core/debugger/remote_debugger.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -673,8 +673,8 @@ void RemoteDebugger::poll_events(bool p_is_idle) {
673673
reload_all_scripts = false;
674674
} else if (!script_paths_to_reload.is_empty()) {
675675
Array scripts_to_reload;
676-
for (int i = 0; i < script_paths_to_reload.size(); ++i) {
677-
String path = script_paths_to_reload[i];
676+
for (const Variant &v : script_paths_to_reload) {
677+
const String &path = v;
678678
Error err = OK;
679679
Ref<Script> script = ResourceLoader::load(path, "", ResourceFormatLoader::CACHE_MODE_REUSE, &err);
680680
ERR_CONTINUE_MSG(err != OK, vformat("Could not reload script '%s': %s", path, error_names[err]));

editor/script/script_editor_plugin.cpp

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,22 +1158,9 @@ void ScriptEditor::trigger_live_script_reload(const String &p_script_path) {
11581158
}
11591159
}
11601160

1161-
void ScriptEditor::trigger_live_script_reload_all() {
1162-
if (!pending_auto_reload && auto_reload_running_scripts) {
1163-
call_deferred(SNAME("_live_auto_reload_running_scripts"));
1164-
pending_auto_reload = true;
1165-
reload_all_scripts = true;
1166-
}
1167-
}
1168-
11691161
void ScriptEditor::_live_auto_reload_running_scripts() {
11701162
pending_auto_reload = false;
1171-
if (reload_all_scripts) {
1172-
EditorDebuggerNode::get_singleton()->reload_all_scripts();
1173-
} else {
1174-
EditorDebuggerNode::get_singleton()->reload_scripts(script_paths_to_reload);
1175-
}
1176-
reload_all_scripts = false;
1163+
EditorDebuggerNode::get_singleton()->reload_scripts(script_paths_to_reload);
11771164
script_paths_to_reload.clear();
11781165
}
11791166

editor/script/script_editor_plugin.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,6 @@ class ScriptEditor : public PanelContainer {
437437

438438
bool pending_auto_reload;
439439
bool auto_reload_running_scripts;
440-
bool reload_all_scripts = false;
441440
Vector<String> script_paths_to_reload;
442441
void _live_auto_reload_running_scripts();
443442

@@ -613,7 +612,6 @@ class ScriptEditor : public PanelContainer {
613612
void update_docs_from_script(const Ref<Script> &p_script);
614613

615614
void trigger_live_script_reload(const String &p_script_path);
616-
void trigger_live_script_reload_all();
617615

618616
VSplitContainer *get_left_list_split() { return list_split; }
619617

0 commit comments

Comments
 (0)