diff options
author | Jorge Bernal <jbernalmartinez@gmail.com> | 2015-01-29 10:22:42 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-01-29 10:26:28 +0300 |
commit | c44d7b0340e6b21444b3218d58857a88b6b32fdd (patch) | |
tree | ee38c2c0dc7a9d4b8d937bae24ecc94119237aa7 /release/scripts/startup | |
parent | 3cf7a8008ee8bd90ee00b9e6d9949cf54aa0ef1f (diff) |
BGE: Remove duplicated audio panel from Render context
This commit removes the audio panel from Render context as it exists a similar panel in Scene context.
Also, it gives to the Distance Model a similar UI layout as it was in the removed render->audio panel
Diffstat (limited to 'release/scripts/startup')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_game.py | 16 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_scene.py | 7 |
2 files changed, 4 insertions, 19 deletions
diff --git a/release/scripts/startup/bl_ui/properties_game.py b/release/scripts/startup/bl_ui/properties_game.py index 4d9dbe67226..4cb6929f290 100644 --- a/release/scripts/startup/bl_ui/properties_game.py +++ b/release/scripts/startup/bl_ui/properties_game.py @@ -519,22 +519,6 @@ class SCENE_PT_game_navmesh(SceneButtonsPanel, Panel): row.prop(rd, "sample_max_error") -class RENDER_PT_game_sound(RenderButtonsPanel, Panel): - bl_label = "Sound" - COMPAT_ENGINES = {'BLENDER_GAME'} - - def draw(self, context): - layout = self.layout - - scene = context.scene - - layout.prop(scene, "audio_distance_model") - - col = layout.column(align=True) - col.prop(scene, "audio_doppler_speed", text="Speed") - col.prop(scene, "audio_doppler_factor") - - class WorldButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py index d601e5619a5..facf54d358a 100644 --- a/release/scripts/startup/bl_ui/properties_scene.py +++ b/release/scripts/startup/bl_ui/properties_scene.py @@ -263,10 +263,11 @@ class SCENE_PT_audio(SceneButtonsPanel, Panel): split = layout.split() col = split.column() - col.label("Listener:") + col.label("Distance Model:") col.prop(scene, "audio_distance_model", text="") - col.prop(scene, "audio_doppler_speed", text="Speed") - col.prop(scene, "audio_doppler_factor", text="Doppler") + sub = col.column(align=True) + sub.prop(scene, "audio_doppler_speed", text="Speed") + sub.prop(scene, "audio_doppler_factor", text="Doppler") col = split.column() col.label("Format:") |