Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-21 19:42:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #78109 from heppocogne/support-relative-path

Browse Source 
Add relative path support for `EditorPlugin::add_autoload_singleton`
This commit is contained in:
Rémi Verschelde 2023-06-15 10:50:33 +02:00
commit 3dca469f8c
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editor/editor_plugin.cpp
View File

@ -62,7 +62,14 @@ void EditorPlugin::remove_custom_type(const String &p_type) {
}
void EditorPlugin::add_autoload_singleton(const String &p_name, const String &p_path) {
EditorNode::get_singleton()->get_project_settings()->get_autoload_settings()->autoload_add(p_name, p_path);
if (p_path.begins_with("res://")) {
EditorNode::get_singleton()->get_project_settings()->get_autoload_settings()->autoload_add(p_name, p_path);
} else {
const Ref<Script> plugin_script = static_cast<Ref<Script>>(get_script());
ERR_FAIL_COND(plugin_script.is_null());
const String script_base_path = plugin_script->get_path().get_base_dir();
EditorNode::get_singleton()->get_project_settings()->get_autoload_settings()->autoload_add(p_name, script_base_path.path_join(p_path));
}
}
void EditorPlugin::remove_autoload_singleton(const String &p_name) {