Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-02-16 15:50:45 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #96007 from kitbdev/fix-external-script-reloading

Browse Source 
Fix script overwriting with external editor
This commit is contained in:
Rémi Verschelde 2024-08-27 16:55:11 +02:00
commit 61f2a33353
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/plugins/script_editor_plugin.cpp
View File

@ -2711,9 +2711,11 @@ void ScriptEditor::apply_scripts() const {
}
void ScriptEditor::reload_scripts(bool p_refresh_only) {
if (external_editor_active) {
return;
}
// Call deferred to make sure it runs on the main thread.
callable_mp(this, &ScriptEditor::_reload_scripts).call_deferred(p_refresh_only);
}
void ScriptEditor::_reload_scripts(bool p_refresh_only) {
for (int i = 0; i < tab_container->get_tab_count(); i++) {
ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
if (!se) {

1
editor/plugins/script_editor_plugin.h
View File

@ -436,6 +436,7 @@ class ScriptEditor : public PanelContainer {
void _file_removed(const String &p_file);
void _autosave_scripts();
void _update_autosave_timer();
void _reload_scripts(bool p_refresh_only = false);
void _update_members_overview_visibility();
void _update_members_overview();