1 files changed, 34 insertions, 30 deletions

diff --git a/release/scripts/startup/bl_ui/properties_data_speaker.py b/release/scripts/startup/bl_ui/properties_data_speaker.py
index eecb2690302..2a3dc4d02c1 100644
--- a/release/scripts/startup/bl_ui/properties_data_speaker.py
+++ b/release/scripts/startup/bl_ui/properties_data_speaker.py
@@ -29,14 +29,14 @@ class DataButtonsPanel:
 
     @classmethod
     def poll(cls, context):
-        engine = context.scene.render.engine
+        engine = context.engine
         return context.speaker and (engine in cls.COMPAT_ENGINES)
 
 
 class DATA_PT_context_speaker(DataButtonsPanel, Panel):
     bl_label = ""
     bl_options = {'HIDE_HEADER'}
-    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
+    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE'}
 
     def draw(self, context):
         layout = self.layout
@@ -55,69 +55,73 @@ class DATA_PT_context_speaker(DataButtonsPanel, Panel):
 
 class DATA_PT_speaker(DataButtonsPanel, Panel):
     bl_label = "Sound"
-    COMPAT_ENGINES = {'BLENDER_RENDER'}
+    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE'}
 
     def draw(self, context):
         layout = self.layout
 
         speaker = context.speaker
 
-        split = layout.split(percentage=0.75)
+        layout.template_ID(speaker, "sound", open="sound.open_mono")
 
-        split.template_ID(speaker, "sound", open="sound.open_mono")
-        split.prop(speaker, "muted")
+        layout.use_property_split = True
 
-        row = layout.row()
-        row.prop(speaker, "volume")
-        row.prop(speaker, "pitch")
+        layout.prop(speaker, "muted")
+
+        col = layout.column()
+        col.active = not speaker.muted
+        col.prop(speaker, "volume", slider=True)
+        col.prop(speaker, "pitch")
 
 
 class DATA_PT_distance(DataButtonsPanel, Panel):
     bl_label = "Distance"
-    COMPAT_ENGINES = {'BLENDER_RENDER'}
+    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE'}
 
     def draw(self, context):
         layout = self.layout
 
-        speaker = context.speaker
+        layout.use_property_split = True
 
-        split = layout.split()
+        speaker = context.speaker
+        layout.active = not speaker.muted
 
-        col = split.column()
-        col.label("Volume:")
-        col.prop(speaker, "volume_min", text="Minimum")
-        col.prop(speaker, "volume_max", text="Maximum")
+        col = layout.column()
+        sub = col.column(align=True)
+        sub.prop(speaker, "volume_min", slider=True, text="Volume Min")
+        sub.prop(speaker, "volume_max", slider=True, text="Max")
         col.prop(speaker, "attenuation")
 
-        col = split.column()
-        col.label("Distance:")
-        col.prop(speaker, "distance_max", text="Maximum")
-        col.prop(speaker, "distance_reference", text="Reference")
+        col.separator()
+        col.prop(speaker, "distance_max", text="Max Distance")
+        col.prop(speaker, "distance_reference", text="Distance Reference")
 
 
 class DATA_PT_cone(DataButtonsPanel, Panel):
     bl_label = "Cone"
-    COMPAT_ENGINES = {'BLENDER_RENDER'}
+    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE'}
 
     def draw(self, context):
         layout = self.layout
 
+        layout.use_property_split = True
+
         speaker = context.speaker
+        layout.active = not speaker.muted
+
+        col = layout.column()
 
-        split = layout.split()
+        sub = col.column(align=True)
+        sub.prop(speaker, "cone_angle_outer", text="Angle Outer")
+        sub.prop(speaker, "cone_angle_inner", text="Inner")
 
-        col = split.column()
-        col.label("Angle:")
-        col.prop(speaker, "cone_angle_outer", text="Outer")
-        col.prop(speaker, "cone_angle_inner", text="Inner")
+        col.separator()
 
-        col = split.column()
-        col.label("Volume:")
-        col.prop(speaker, "cone_volume_outer", text="Outer")
+        col.prop(speaker, "cone_volume_outer", slider=True)
 
 
 class DATA_PT_custom_props_speaker(DataButtonsPanel, PropertyPanel, Panel):
-    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
+    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE'}
     _context_path = "object.data"
     _property_type = bpy.types.Speaker