godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-21 14:57:09 +00:00
Code Releases Wiki Activity

Misc script editor code cleanup

Browse Source
This commit is contained in:
kobewi
2024-07-07 00:14:39 +02:00
parent 019889d1da
commit 89432600ce
3 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/debugger/remote_debugger.cpp
View File

@@ -673,8 +673,8 @@ void RemoteDebugger::poll_events(bool p_is_idle) {
reload_all_scripts = false; reload_all_scripts = false;
} else if (!script_paths_to_reload.is_empty()) { } else if (!script_paths_to_reload.is_empty()) {
Array scripts_to_reload; Array scripts_to_reload;
for (int i = 0; i < script_paths_to_reload.size(); ++i) { for (const Variant &v : script_paths_to_reload) {
String path = script_paths_to_reload[i]; const String &path = v;
Error err = OK; Error err = OK;
Ref<Script> script = ResourceLoader::load(path, "", ResourceFormatLoader::CACHE_MODE_REUSE, &err); Ref<Script> script = ResourceLoader::load(path, "", ResourceFormatLoader::CACHE_MODE_REUSE, &err);
ERR_CONTINUE_MSG(err != OK, vformat("Could not reload script '%s': %s", path, error_names[err])); ERR_CONTINUE_MSG(err != OK, vformat("Could not reload script '%s': %s", path, error_names[err]));

13
editor/script/script_editor_plugin.cpp
View File

@@ -1158,22 +1158,9 @@ void ScriptEditor::trigger_live_script_reload(const String &p_script_path) {
} }
} }
void ScriptEditor::trigger_live_script_reload_all() {
if (!pending_auto_reload && auto_reload_running_scripts) {
call_deferred(SNAME("_live_auto_reload_running_scripts"));
pending_auto_reload = true;
reload_all_scripts = true;
}
}
void ScriptEditor::_live_auto_reload_running_scripts() { void ScriptEditor::_live_auto_reload_running_scripts() {
pending_auto_reload = false; pending_auto_reload = false;
if (reload_all_scripts) {
EditorDebuggerNode::get_singleton()->reload_all_scripts();
} else {
EditorDebuggerNode::get_singleton()->reload_scripts(script_paths_to_reload); EditorDebuggerNode::get_singleton()->reload_scripts(script_paths_to_reload);
}
reload_all_scripts = false;
script_paths_to_reload.clear(); script_paths_to_reload.clear();
} }

2
editor/script/script_editor_plugin.h
View File

@@ -437,7 +437,6 @@ class ScriptEditor : public PanelContainer {
bool pending_auto_reload; bool pending_auto_reload;
bool auto_reload_running_scripts; bool auto_reload_running_scripts;
bool reload_all_scripts = false;
Vector<String> script_paths_to_reload; Vector<String> script_paths_to_reload;
void _live_auto_reload_running_scripts(); void _live_auto_reload_running_scripts();
@@ -613,7 +612,6 @@ public:
void update_docs_from_script(const Ref<Script> &p_script); void update_docs_from_script(const Ref<Script> &p_script);
void trigger_live_script_reload(const String &p_script_path); void trigger_live_script_reload(const String &p_script_path);
void trigger_live_script_reload_all();
VSplitContainer *get_left_list_split() { return list_split; } VSplitContainer *get_left_list_split() { return list_split; }