Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-10 06:03:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #97187 from KoBeWi/do_not
Some checks are pending
🔗 GHA / 📊 Static checks (push) Waiting to run
Details
🔗 GHA / 🤖 Android (push) Blocked by required conditions
Details
🔗 GHA / 🍏 iOS (push) Blocked by required conditions
Details
🔗 GHA / 🐧 Linux (push) Blocked by required conditions
Details
🔗 GHA / 🍎 macOS (push) Blocked by required conditions
Details
🔗 GHA / 🏁 Windows (push) Blocked by required conditions
Details
🔗 GHA / 🌐 Web (push) Blocked by required conditions
Details
🔗 GHA / 🪲 Godot CPP (push) Blocked by required conditions
Details

Browse Source 
Don't store project metadata when loading
This commit is contained in:
Rémi Verschelde 2024-09-19 17:13:56 +02:00
commit 0a4aedb360
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/action_map_editor.cpp
View File

@ -589,7 +589,7 @@ ActionMapEditor::ActionMapEditor() {
add_hbox->add_child(show_builtin_actions_checkbutton); 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 = 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); main_vbox->add_child(add_hbox);

9
editor/editor_node.cpp
View File

@ -4113,7 +4113,9 @@ Error EditorNode::load_scene(const String &p_scene, bool p_ignore_broken_deps, b
_update_title(); _update_title();
scene_tabs->update_scene_tabs(); scene_tabs->update_scene_tabs();
if (!restoring_scenes) {
_add_to_recent_scenes(lpath); _add_to_recent_scenes(lpath);
}
return OK; return OK;
} }
@ -7908,9 +7910,14 @@ EditorNode::EditorNode() {
title_bar->set_can_move_window(true); title_bar->set_can_move_window(true);
} }
String exec = OS::get_singleton()->get_executable_path(); {
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. // Save editor executable path for third-party tools.
if (exec != old_exec) {
EditorSettings::get_singleton()->set_project_metadata("editor_metadata", "executable_path", exec); EditorSettings::get_singleton()->set_project_metadata("editor_metadata", "executable_path", exec);
}
}
follow_system_theme = EDITOR_GET("interface/theme/follow_system_theme"); follow_system_theme = EDITOR_GET("interface/theme/follow_system_theme");
use_system_accent_color = EDITOR_GET("interface/theme/use_system_accent_color"); use_system_accent_color = EDITOR_GET("interface/theme/use_system_accent_color");

2
editor/project_settings_editor.cpp
View File

@ -771,7 +771,7 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) {
bool use_advanced = EditorSettings::get_singleton()->get_project_metadata("project_settings", "advanced_mode", false); bool use_advanced = EditorSettings::get_singleton()->get_project_metadata("project_settings", "advanced_mode", false);
if (use_advanced) { if (use_advanced) {
advanced->set_pressed(true); advanced->set_pressed_no_signal(true);
} }
_update_advanced(use_advanced); _update_advanced(use_advanced);