diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-19 17:13:56 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-19 17:13:56 +0200 |
| commit | 0a4aedb36065f66fc7e99cb2e6de3e55242f9dfb (patch) | |
| tree | e89164a8e00b6f4a7f4e13d520316e4de4009991 | |
| parent | c8d76c1edd53cb835fa172b7aad061ea87e345b6 (diff) | |
| parent | b277a2985d81efd4e15d8606ddd6ee12db0b2ed1 (diff) | |
| download | redot-engine-0a4aedb36065f66fc7e99cb2e6de3e55242f9dfb.tar.gz | |
Merge pull request #97187 from KoBeWi/do_not
Don't store project metadata when loading
| -rw-r--r-- | editor/action_map_editor.cpp | 2 | ||||
| -rw-r--r-- | editor/editor_node.cpp | 15 | ||||
| -rw-r--r-- | editor/project_settings_editor.cpp | 2 |
3 files changed, 13 insertions, 6 deletions
diff --git a/editor/action_map_editor.cpp b/editor/action_map_editor.cpp index d648dab298..0d89f37dd2 100644 --- a/editor/action_map_editor.cpp +++ b/editor/action_map_editor.cpp @@ -589,7 +589,7 @@ ActionMapEditor::ActionMapEditor() { add_hbox->add_child(show_builtin_actions_checkbutton); show_builtin_actions = EditorSettings::get_singleton()->get_project_metadata("project_settings", "show_builtin_actions", false); - show_builtin_actions_checkbutton->set_pressed(show_builtin_actions); + show_builtin_actions_checkbutton->set_pressed_no_signal(show_builtin_actions); main_vbox->add_child(add_hbox); diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 081478fc1d..0eb566f9be 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -4113,7 +4113,9 @@ Error EditorNode::load_scene(const String &p_scene, bool p_ignore_broken_deps, b _update_title(); scene_tabs->update_scene_tabs(); - _add_to_recent_scenes(lpath); + if (!restoring_scenes) { + _add_to_recent_scenes(lpath); + } return OK; } @@ -7908,9 +7910,14 @@ EditorNode::EditorNode() { title_bar->set_can_move_window(true); } - String exec = OS::get_singleton()->get_executable_path(); - // Save editor executable path for third-party tools. - EditorSettings::get_singleton()->set_project_metadata("editor_metadata", "executable_path", exec); + { + const String exec = OS::get_singleton()->get_executable_path(); + const String old_exec = EditorSettings::get_singleton()->get_project_metadata("editor_metadata", "executable_path", ""); + // Save editor executable path for third-party tools. + if (exec != old_exec) { + EditorSettings::get_singleton()->set_project_metadata("editor_metadata", "executable_path", exec); + } + } follow_system_theme = EDITOR_GET("interface/theme/follow_system_theme"); use_system_accent_color = EDITOR_GET("interface/theme/use_system_accent_color"); diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp index 3ad1ad1899..d00fdc2123 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/project_settings_editor.cpp @@ -771,7 +771,7 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) { bool use_advanced = EditorSettings::get_singleton()->get_project_metadata("project_settings", "advanced_mode", false); if (use_advanced) { - advanced->set_pressed(true); + advanced->set_pressed_no_signal(true); } _update_advanced(use_advanced); |