mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-18 20:40:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #85154 from KoBeWi/yo_dawg_I_heard_you_like_saving_scen-JUST_STOP_IT

Browse Source 
Avoid saving scene while already saving the scene
This commit is contained in:
Rémi Verschelde 2023-11-22 13:59:37 +01:00
commit 51bca1b586
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editor/editor_node.cpp
View File

@ -1761,6 +1761,10 @@ static void _reset_animation_mixers(Node *p_node, List<Pair<AnimationMixer *, Re
}
void EditorNode::_save_scene(String p_file, int idx) {
if (!saving_scene.is_empty() && saving_scene == p_file) {
return;
}
Node *scene = editor_data.get_edited_scene_root(idx);
if (!scene) {
@ -1817,7 +1821,9 @@ void EditorNode::_save_scene(String p_file, int idx) {
emit_signal(SNAME("scene_saved"), p_file);
_save_external_resources();
saving_scene = p_file; // Some editors may save scenes of built-in resources as external data, so avoid saving this scene again.
editor_data.save_editor_external_data();
saving_scene = "";
for (Pair<AnimationMixer *, Ref<AnimatedValuesBackup>> &E : anim_backups) {
E.first->restore(E.second);

1
editor/editor_node.h
View File

@ -481,6 +481,7 @@ private:
String _tmp_import_path;
String external_file;
String open_navigate;
String saving_scene;
DynamicFontImportSettings *fontdata_import_settings = nullptr;
SceneImportSettings *scene_import_settings = nullptr;