[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39797] trunk/blender/release/scripts/ startup/bl_ui: 2.5 UI Files:

[Thomas Dinges]

Revision: 39797
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39797
Author:   dingto
Date:     2011-08-30 10:44:02 +0000 (Tue, 30 Aug 2011)
Log Message:
-----------
2.5 UI Files:
* Code cleanup after Pepper merge. 

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py
    trunk/blender/release/scripts/startup/bl_ui/properties_data_speaker.py
    trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py
    trunk/blender/release/scripts/startup/bl_ui/properties_render.py
    trunk/blender/release/scripts/startup/bl_ui/properties_scene.py

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py	2011-08-30 10:09:10 UTC (rev 39796)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py	2011-08-30 10:44:02 UTC (rev 39797)
@@ -72,8 +72,7 @@
         flow.prop(arm, "use_deform_preserve_volume", text="Quaternion")
 
         if context.scene.render.engine == "BLENDER_GAME":
-            col = layout.column()
-            col.prop(arm, "vert_deformer")
+            layout.row().prop(arm, "vert_deformer", expand=True, text="")
 
 class DATA_PT_display(ArmatureButtonsPanel, Panel):
     bl_label = "Display"

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_speaker.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_speaker.py	2011-08-30 10:09:10 UTC (rev 39796)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_speaker.py	2011-08-30 10:44:02 UTC (rev 39797)
@@ -66,10 +66,7 @@
         split.template_ID(speaker, "sound", open="sound.open_mono")
         split.prop(speaker, "muted")
 
-        split = layout.split()
-
-        row = split.row()
-
+        row = layout.row()
         row.prop(speaker, "volume")
         row.prop(speaker, "pitch")
 
@@ -84,15 +81,14 @@
         speaker = context.speaker
 
         split = layout.split()
+        
         col = split.column()
-
         col.label("Volume:")
         col.prop(speaker, "volume_min", text="Minimum")
         col.prop(speaker, "volume_max", text="Maximum")
         col.prop(speaker, "attenuation")
 
         col = split.column()
-
         col.label("Distance:")
         col.prop(speaker, "distance_max", text="Maximum")
         col.prop(speaker, "distance_reference", text="Reference")

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py	2011-08-30 10:09:10 UTC (rev 39796)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py	2011-08-30 10:44:02 UTC (rev 39797)
@@ -235,7 +235,6 @@
         row.label()
 
     def LIMIT_ROTATION(self, context, layout, con):
-
         split = layout.split()
 
         col = split.column(align=True)
@@ -259,9 +258,7 @@
         sub.prop(con, "min_z", text="Min")
         sub.prop(con, "max_z", text="Max")
 
-        row = layout.row()
-        row.prop(con, "use_transform_limit")
-        row.label()
+        layout.prop(con, "use_transform_limit")
 
         row = layout.row()
         row.label(text="Convert:")

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_render.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_render.py	2011-08-30 10:09:10 UTC (rev 39796)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_render.py	2011-08-30 10:44:02 UTC (rev 39797)
@@ -592,14 +592,11 @@
         if rd.ffmpeg_format not in {'MP3'}:
             layout.prop(rd, "ffmpeg_audio_codec", text="Audio Codec")
 
-        split = layout.split()
+        row = layout.row()
+        row.prop(rd, "ffmpeg_audio_bitrate")
+        row.prop(rd, "ffmpeg_audio_volume", slider=True)
 
-        col = split.column()
-        col.prop(rd, "ffmpeg_audio_bitrate")
-        col = split.column()
-        col.prop(rd, "ffmpeg_audio_volume", slider=True)
 
-
 class RENDER_PT_bake(RenderButtonsPanel, Panel):
     bl_label = "Bake"
     bl_options = {'DEFAULT_CLOSED'}

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_scene.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_scene.py	2011-08-30 10:09:10 UTC (rev 39796)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_scene.py	2011-08-30 10:44:02 UTC (rev 39797)
@@ -59,14 +59,12 @@
         split = layout.split()
 
         col = split.column()
-
         col.label("Listener:")
         col.prop(scene, "audio_distance_model", text="")
         col.prop(scene, "audio_doppler_speed", text="Speed")
         col.prop(scene, "audio_doppler_factor", text="Doppler")
 
         col = split.column()
-
         col.label("Format:")
         col.prop(rd, "ffmpeg_audio_channels", text="")
         col.prop(rd, "ffmpeg_audio_mixrate", text="Rate")