From e56c5dd982ff80ee52ffd1bf1e36a2f3ff33a9b2 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 12 Sep 2018 19:45:43 +1000 Subject: [PATCH] Remove ifdef's default audio device If we want to select an audio device based on build flags, it should be done as a final step. --- source/blender/blenloader/intern/versioning_userdef.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c index e888c23cd0a..d077784a361 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -135,12 +135,7 @@ void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef) if (userdef->audiochannels == 0) userdef->audiochannels = 2; if (userdef->audiodevice == 0) { -#ifdef WITH_OPENAL - userdef->audiodevice = 2; -#endif -#ifdef WITH_SDL - userdef->audiodevice = 1; -#endif + userdef->audiodevice = 2; /* OpenAL */ } if (userdef->audioformat == 0) userdef->audioformat = 0x24;