[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40591] branches/soc-2011-cucumber/release /scripts/startup/bl_ui: Grabbed the properties_game. py from my patched Trunk and attempted to get a better "merge" this time.

[Daniel Stokes]

Revision: 40591
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40591
Author:   kupoman
Date:     2011-09-27 05:43:15 +0000 (Tue, 27 Sep 2011)
Log Message:
-----------
Grabbed the properties_game.py from my patched Trunk and attempted to get a better "merge" this time.

Also fixed up some errors from properties_scene.py from some stuff that was added after messing around in that file last time.

Modified Paths:
--------------
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_scene.py

Modified: branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_game.py
===================================================================
--- branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_game.py	2011-09-27 05:28:06 UTC (rev 40590)
+++ branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_game.py	2011-09-27 05:43:15 UTC (rev 40591)
@@ -18,6 +18,7 @@
 
 # <pep8 compliant>
 import bpy
+from bpy.types import Panel
 
 
 class PhysicsButtonsPanel():
@@ -26,7 +27,7 @@
     bl_context = "physics"
 
 
-class PHYSICS_PT_game_physics(PhysicsButtonsPanel, bpy.types.Panel):
+class PHYSICS_PT_game_physics(PhysicsButtonsPanel, Panel):
     bl_label = "Physics"
     COMPAT_ENGINES = {'BLENDER_GAME'}
 
@@ -194,7 +195,7 @@
             layout.prop(ob, "hide_render", text="Invisible")
 
 
-class PHYSICS_PT_game_collision_bounds(PhysicsButtonsPanel, bpy.types.Panel):
+class PHYSICS_PT_game_collision_bounds(PhysicsButtonsPanel, Panel):
     bl_label = "Collision Bounds"
     COMPAT_ENGINES = {'BLENDER_GAME'}
 
@@ -260,7 +261,7 @@
         return (rd.engine in cls.COMPAT_ENGINES)
 
 
-# class RENDER_PT_game(RenderButtonsPanel, bpy.types.Panel):
+# class RENDER_PT_game(RenderButtonsPanel, Panel):
     # bl_label = "Game"
     # COMPAT_ENGINES = {'BLENDER_GAME'}
 
@@ -300,7 +301,7 @@
         # sub.prop(rd, "resolution_y", slider=False, text="Y")
 
 
-class RENDER_PT_game_player(RenderButtonsPanel, bpy.types.Panel):
+class RENDER_PT_game_player(RenderButtonsPanel, Panel):
     bl_label = "Standalone Player"
     COMPAT_ENGINES = {'BLENDER_GAME'}
 
@@ -350,7 +351,7 @@
         # sub.prop(gs, "frequency", text="Refresh Rate", slider=False)
 
 
-class RENDER_PT_game_stereo(RenderButtonsPanel, bpy.types.Panel):
+class RENDER_PT_game_stereo(RenderButtonsPanel, Panel):
     bl_label = "Stereo"
     COMPAT_ENGINES = {'BLENDER_GAME'}
 
@@ -404,7 +405,7 @@
             layout.prop(gs, "dome_text")
 
 
-class RENDER_PT_game_shading(RenderButtonsPanel, bpy.types.Panel):
+class RENDER_PT_game_shading(RenderButtonsPanel, Panel):
     bl_label = "Shading"
     COMPAT_ENGINES = {'BLENDER_GAME'}
 
@@ -438,7 +439,7 @@
             col.prop(gs, "use_glsl_nodes", text="Nodes")
             col.prop(gs, "use_glsl_extra_textures", text="Extra Textures")
             
-class RENDER_PT_game_system(RenderButtonsPanel, bpy.types.Panel):
+class RENDER_PT_game_system(RenderButtonsPanel, Panel):
     bl_label = "System"
     COMPAT_ENGINES = {'BLENDER_GAME'}
 
@@ -450,10 +451,11 @@
         row = col.row()
         col = row.column()
         col.prop(gs, "use_frame_rate")
+        col.prop(gs, "restrict_animation_updates")
         col = row.column()
         col.prop(gs, "use_display_lists")
         col.active = gs.raster_storage != 'VERTEX_BUFFER_OBJECT'
-        
+		
         row = layout.row()
         row.prop(gs, "raster_storage")
         
@@ -461,7 +463,6 @@
         row.label("Exit Key")
         row.prop(gs, "exit_key", text="", event=True)
 
-        col.prop(gs, "restrict_animation_updates")
 
 
 class RENDER_PT_game_display(RenderButtonsPanel, Panel):
@@ -553,13 +554,27 @@
         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'
     bl_context = "world"
 
 
-class WORLD_PT_game_context_world(WorldButtonsPanel, bpy.types.Panel):
+class WORLD_PT_game_context_world(WorldButtonsPanel, Panel):
     bl_label = ""
     bl_options = {'HIDE_HEADER'}
     COMPAT_ENGINES = {'BLENDER_GAME'}
@@ -583,7 +598,7 @@
             split.template_ID(space, "pin_id")
 
 
-class WORLD_PT_game_world(WorldButtonsPanel, bpy.types.Panel):
+class WORLD_PT_game_world(WorldButtonsPanel, Panel):
     bl_label = "World"
     COMPAT_ENGINES = {'BLENDER_GAME'}
 
@@ -602,7 +617,7 @@
         row.column().prop(world, "ambient_color")
 
 
-class WORLD_PT_game_mist(WorldButtonsPanel, bpy.types.Panel):
+class WORLD_PT_game_mist(WorldButtonsPanel, Panel):
     bl_label = "Mist"
     COMPAT_ENGINES = {'BLENDER_GAME'}
 
@@ -628,7 +643,7 @@
         row.prop(world.mist_settings, "depth")
 
 
-class WORLD_PT_game_physics(WorldButtonsPanel, bpy.types.Panel):
+class WORLD_PT_game_physics(WorldButtonsPanel, Panel):
     bl_label = "Physics"
     COMPAT_ENGINES = {'BLENDER_GAME'}
 

Modified: branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_scene.py
===================================================================
--- branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_scene.py	2011-09-27 05:28:06 UTC (rev 40590)
+++ branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_scene.py	2011-09-27 05:43:15 UTC (rev 40591)
@@ -93,6 +93,7 @@
 
 class SCENE_PT_keying_sets(SceneButtonsPanel, Panel):
     bl_label = "Keying Sets"
+	COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
 
     def draw(self, context):
         layout = self.layout
@@ -126,6 +127,7 @@
 
 class SCENE_PT_keying_set_paths(SceneButtonsPanel, Panel):
     bl_label = "Active Keying Set"
+	COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
 
     @classmethod
     def poll(cls, context):