summaryrefslogtreecommitdiff
path: root/servers
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-04-08 11:06:35 +0200
committerGitHub <noreply@github.com>2019-04-08 11:06:35 +0200
commita994db62df731879bb9c54e65b4ddca32396e9d3 (patch)
treec9451f10a4b29e14fc14c210faf7fe4ffa932f18 /servers
parentb60754ab405d6a332c33f12f9df9399f70ee7164 (diff)
parent650b698f5174e9c4e29781f551af560a55a1e87a (diff)
Merge pull request #27644 from lupoDharkael/bus
Allow default audio bus layout modification
Diffstat (limited to 'servers')
-rw-r--r--servers/audio_server.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp
index 8c092a02a2..7b2b48fe47 100644
--- a/servers/audio_server.cpp
+++ b/servers/audio_server.cpp
@@ -1045,8 +1045,10 @@ void AudioServer::update() {
void AudioServer::load_default_bus_layout() {
- if (ResourceLoader::exists("res://default_bus_layout.tres")) {
- Ref<AudioBusLayout> default_layout = ResourceLoader::load("res://default_bus_layout.tres");
+ String layout_path = ProjectSettings::get_singleton()->get("audio/default_bus_layout");
+
+ if (ResourceLoader::exists(layout_path)) {
+ Ref<AudioBusLayout> default_layout = ResourceLoader::load(layout_path);
if (default_layout.is_valid()) {
set_bus_layout(default_layout);
}