diff options
| -rw-r--r-- | extern/audaspace/src/devices/DeviceManager.cpp | 7 | ||||
| m--------- | release/datafiles/locale | 0 | ||||
| m--------- | release/scripts/addons | 0 | ||||
| m--------- | release/scripts/addons_contrib | 0 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/versioning_userdef.c | 3 | ||||
| m--------- | source/tools | 0 |
6 files changed, 6 insertions, 4 deletions
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 -Subproject f81ed052157aff3979763cf25840032d11d261b +Subproject 345b7d27872d87ae5074a83d8b9995b37bc56f1 diff --git a/release/scripts/addons b/release/scripts/addons -Subproject 5f7fba0565a7c9ae93eae31a08fc9bbbd16d333 +Subproject cd9213d669fa8cd585dcadb1a5b09fcdedd1212 diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib -Subproject fecc0db5600405a0c14c70120ae279222861ef8 +Subproject 4c5ddaeb2d1953ea9db10b2fdde2f93e19b1d6d 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 -Subproject 3f0d91e9249bf35b92ee745e2c45c460c869fb2 +Subproject 279c373280e54388ede50abea9d11d5cdaa1d56 |