gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-04 23:58:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #85513 from KoBeWi/that_one_weird_plugin_that_uses_no_Resources

Browse source 
Save external data even without scene
This commit is contained in:
Rémi Verschelde 2024-06-26 14:51:11 +02:00
parent b0c7f45a72 0b172742cf
commit 54dbb17273
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
editor/editor_node.cpp
View file

@ -1737,7 +1737,7 @@ bool EditorNode::_validate_scene_recursive(const String &p_filename, Node *p_nod
return false;
}
int EditorNode::_save_external_resources() {
int EditorNode::_save_external_resources(bool p_also_save_external_data) {
// Save external resources and its subresources if any was modified.
int flg = 0;
@ -1783,6 +1783,16 @@ int EditorNode::_save_external_resources() {
saved++;
}
if (p_also_save_external_data) {
for (int i = 0; i < editor_data.get_editor_plugin_count(); i++) {
EditorPlugin *plugin = editor_data.get_editor_plugin(i);
if (!plugin->get_unsaved_status().is_empty()) {
plugin->save_external_data();
saved++;
}
}
}
EditorUndoRedoManager::get_singleton()->set_history_as_saved(EditorUndoRedoManager::GLOBAL_HISTORY);
return saved;
@ -2726,10 +2736,10 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
ScriptEditor::get_singleton()->save_current_script();
}
const int saved = _save_external_resources();
const int saved = _save_external_resources(true);
if (saved > 0) {
show_accept(
vformat(TTR("The current scene has no root node, but %d modified external resource(s) were saved anyway."), saved),
vformat(TTR("The current scene has no root node, but %d modified external resource(s) and/or plugin data were saved anyway."), saved),
TTR("OK"));
} else if (p_option == FILE_SAVE_AS_SCENE) {
// Don't show this dialog when pressing Ctrl + S to avoid interfering with script saving.

2
editor/editor_node.h
View file

@ -573,7 +573,7 @@ private:
void _update_undo_redo_allowed();
int _save_external_resources();
int _save_external_resources(bool p_also_save_external_data = false);
void _set_current_scene(int p_idx);
void _set_current_scene_nocheck(int p_idx);