godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-23 15:16:17 +00:00
Code Releases Wiki Activity

Fix how scripts reload outside of ScriptEditor

Browse Source
This commit is contained in:
Paul Joannon
2024-03-07 20:19:05 +01:00
parent aef11a1427
commit 63674648fb
3 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/object/script_language.cpp
View File

@@ -34,6 +34,7 @@
#include "core/core_string_names.h"
#include "core/debugger/engine_debugger.h"
#include "core/debugger/script_debugger.h"
#include "core/io/resource_loader.h"
#include <stdint.h>
@@ -154,6 +155,24 @@ void Script::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::STRING, "source_code", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "set_source_code", "get_source_code");
}
void Script::reload_from_file() {
#ifdef TOOLS_ENABLED
// Replicates how the ScriptEditor reloads script resources, which generally handles it.
// However, when scripts are to be reloaded but aren't open in the internal editor, we go through here instead.
const Ref<Script> rel = ResourceLoader::load(ResourceLoader::path_remap(get_path()), get_class(), ResourceFormatLoader::CACHE_MODE_IGNORE);
if (rel.is_null()) {
return;
}
set_source_code(rel->get_source_code());
set_last_modified_time(rel->get_last_modified_time());
reload();
#else
Resource::reload_from_file();
#endif
}
void ScriptServer::set_scripting_enabled(bool p_enabled) {
scripting_enabled = p_enabled;
}