Commit: 6fd11a21f5c589aab856ca5992fea768820229ec
Author: Jörg Müller
Date: Sun Mar 10 23:28:51 2019 +0100
Branches: master
https://developer.blender.org/rB6fd11a21f5c589aab856ca5992fea768820229ec
Fix T62255: Blender defaults to "OpenAL Soft" in sound settings, regardless of
saved preferences
- Default device (index 0) was hard coded.
- Also fixing crash with invalid device passed to blender via -setaudio.
===================================================================
M extern/audaspace/src/devices/DeviceManager.cpp
M release/datafiles/locale
M release/scripts/addons
M release/scripts/addons_contrib
M source/blender/blenloader/intern/versioning_userdef.c
M source/tools
===================================================================
diff --git a/extern/audaspace/src/devices/DeviceManager.cpp
b/extern/audaspace/src/devices/DeviceManager.cpp
index 2ebc3d58c86..304f8b49f70 100644
--- a/extern/audaspace/src/devices/DeviceManager.cpp
+++ b/extern/audaspace/src/devices/DeviceManager.cpp
@@ -35,7 +35,12 @@ void DeviceManager::registerDevice(std::string name,
std::shared_ptr<IDeviceFact
std::shared_ptr<IDeviceFactory> DeviceManager::getDeviceFactory(std::string
name)
{
- return m_factories[name];
+ auto it = m_factories.find(name);
+
+ if(it == m_factories.end())
+ return nullptr;
+
+ return it->second;
}
std::shared_ptr<IDeviceFactory> DeviceManager::getDefaultDeviceFactory()
diff --git a/release/datafiles/locale b/release/datafiles/locale
index f81ed052157..345b7d27872 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit f81ed052157aff3979763cf25840032d11d261b6
+Subproject commit 345b7d27872d87ae5074a83d8b9995b37bc56f1b
diff --git a/release/scripts/addons b/release/scripts/addons
index 5f7fba0565a..cd9213d669f 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 5f7fba0565a7c9ae93eae31a08fc9bbbd16d333a
+Subproject commit cd9213d669fa8cd585dcadb1a5b09fcdedd1212e
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index fecc0db5600..4c5ddaeb2d1 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit fecc0db5600405a0c14c70120ae279222861ef80
+Subproject commit 4c5ddaeb2d1953ea9db10b2fdde2f93e19b1d6d7
diff --git a/source/blender/blenloader/intern/versioning_userdef.c
b/source/blender/blenloader/intern/versioning_userdef.c
index ef0cd7bc7d5..84722f3a3f7 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -493,9 +493,6 @@ void BLO_version_defaults_userpref_blend(Main *bmain,
UserDef *userdef)
if (userdef->image_draw_method == 0)
userdef->image_draw_method = IMAGE_DRAW_METHOD_2DTEXTURE;
- // we default to the first audio device
- userdef->audiodevice = 0;
-
for (bTheme *btheme = userdef->themes.first; btheme; btheme =
btheme->next) {
do_versions_theme(userdef, btheme);
}
diff --git a/source/tools b/source/tools
index 3f0d91e9249..279c373280e 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 3f0d91e9249bf35b92ee745e2c45c460c869fb25
+Subproject commit 279c373280e54388ede50abea9d11d5cdaa1d567
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
