diff options
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/dependency_editor.cpp | 6 | ||||
| -rw-r--r-- | editor/editor_audio_buses.cpp | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/editor/dependency_editor.cpp b/editor/dependency_editor.cpp index 5c35a91fea..5df2b687cc 100644 --- a/editor/dependency_editor.cpp +++ b/editor/dependency_editor.cpp @@ -496,7 +496,8 @@ void DependencyRemoveDialog::ok_pressed() { res->set_path(""); } - // If the file we are deleting for e.g. the main scene or default environment, we must clear its definition in Project Settings. + // If the file we are deleting for e.g. the main scene, default environment, + // or audio bus layout, we must clear its definition in Project Settings. if (files_to_delete[i] == ProjectSettings::get_singleton()->get("application/config/icon")) { ProjectSettings::get_singleton()->set("application/config/icon", ""); } @@ -518,6 +519,9 @@ void DependencyRemoveDialog::ok_pressed() { if (files_to_delete[i] == ProjectSettings::get_singleton()->get("gui/theme/custom_font")) { ProjectSettings::get_singleton()->set("gui/theme/custom_font", ""); } + if (files_to_delete[i] == ProjectSettings::get_singleton()->get("audio/default_bus_layout")) { + ProjectSettings::get_singleton()->set("audio/default_bus_layout", ""); + } String path = OS::get_singleton()->get_resource_dir() + files_to_delete[i].replace_first("res://", "/"); print_verbose("Moving to trash: " + path); diff --git a/editor/editor_audio_buses.cpp b/editor/editor_audio_buses.cpp index d7838a2df8..49d40e6d90 100644 --- a/editor/editor_audio_buses.cpp +++ b/editor/editor_audio_buses.cpp @@ -1180,14 +1180,16 @@ void EditorAudioBuses::_load_layout() { void EditorAudioBuses::_load_default_layout() { - Ref<AudioBusLayout> state = ResourceLoader::load("res://default_bus_layout.tres"); + String layout_path = ProjectSettings::get_singleton()->get("audio/default_bus_layout"); + + Ref<AudioBusLayout> state = ResourceLoader::load(layout_path); if (state.is_null()) { - EditorNode::get_singleton()->show_warning(TTR("There is no 'res://default_bus_layout.tres' file.")); + EditorNode::get_singleton()->show_warning(vformat(TTR("There is no '%s' file."), layout_path)); return; } - edited_path = "res://default_bus_layout.tres"; - file->set_text(edited_path.get_file()); + edited_path = layout_path; + file->set_text(layout_path.get_file()); AudioServer::get_singleton()->set_bus_layout(state); _update_buses(); EditorNode::get_singleton()->get_undo_redo()->clear_history(); @@ -1316,7 +1318,7 @@ EditorAudioBuses::EditorAudioBuses() { set_v_size_flags(SIZE_EXPAND_FILL); - edited_path = "res://default_bus_layout.tres"; + edited_path = ProjectSettings::get_singleton()->get("audio/default_bus_layout"); file_dialog = memnew(EditorFileDialog); List<String> ext; |