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.
This commit is contained in:
@@ -35,7 +35,12 @@ void DeviceManager::registerDevice(std::string name, std::shared_ptr<IDeviceFact
|
|||||||
|
|
||||||
std::shared_ptr<IDeviceFactory> DeviceManager::getDeviceFactory(std::string name)
|
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()
|
std::shared_ptr<IDeviceFactory> DeviceManager::getDefaultDeviceFactory()
|
||||||
|
Submodule release/datafiles/locale updated: f81ed05215...345b7d2787
Submodule release/scripts/addons updated: 5f7fba0565...cd9213d669
Submodule release/scripts/addons_contrib updated: fecc0db560...4c5ddaeb2d
@@ -493,9 +493,6 @@ void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef)
|
|||||||
if (userdef->image_draw_method == 0)
|
if (userdef->image_draw_method == 0)
|
||||||
userdef->image_draw_method = IMAGE_DRAW_METHOD_2DTEXTURE;
|
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) {
|
for (bTheme *btheme = userdef->themes.first; btheme; btheme = btheme->next) {
|
||||||
do_versions_theme(userdef, btheme);
|
do_versions_theme(userdef, btheme);
|
||||||
}
|
}
|
||||||
|
Submodule source/tools updated: 3f0d91e924...279c373280
Reference in New Issue
Block a user