Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Müller <nexyon@gmail.com>2015-07-24 16:44:17 +0300
committerJörg Müller <nexyon@gmail.com>2015-07-28 15:01:53 +0300
commit29ebb56f4d8b99ca3038c7a3d0ed794ef77ee7f9 (patch)
tree32f1dae9ea80dd3c1843f5cc00ecceea23da5dc4 /release
parenta0cbebf404d6c46e59b090e7217ce39d7e760809 (diff)
Audaspace: support the device list returned by the new audaspace library.
- use the device names returned from the library. - system settings UI changed as new audaspace might contain longer and more device names.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_userpref.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index f53df6533e0..6be24a8d551 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -411,9 +411,9 @@ class USERPREF_PT_system(Panel):
col.separator()
col.label(text="Sound:")
- col.row().prop(system, "audio_device", expand=True)
+ col.row().prop(system, "audio_device", expand=False)
sub = col.column()
- sub.active = system.audio_device != 'NONE'
+ sub.active = system.audio_device != 'NONE' and system.audio_device != 'Null'
#sub.prop(system, "use_preview_images")
sub.prop(system, "audio_channels", text="Channels")
sub.prop(system, "audio_mixing_buffer", text="Mixing Buffer")