archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

2.5 UI Files:

Browse Source 
* Code cleanup after Pepper merge.
This commit is contained in:
Thomas Dinges
2011-08-30 10:44:02 +00:00
parent 947d4a654b
commit 6c9ee34dd8
5 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
release/scripts/startup/bl_ui/properties_data_armature.py
View File

@@ -72,8 +72,7 @@ class DATA_PT_skeleton(ArmatureButtonsPanel, Panel):
flow.prop(arm, "use_deform_preserve_volume", text="Quaternion") flow.prop(arm, "use_deform_preserve_volume", text="Quaternion")
if context.scene.render.engine == "BLENDER_GAME": if context.scene.render.engine == "BLENDER_GAME":
col = layout.column() layout.row().prop(arm, "vert_deformer", expand=True, text="")
col.prop(arm, "vert_deformer")
class DATA_PT_display(ArmatureButtonsPanel, Panel): class DATA_PT_display(ArmatureButtonsPanel, Panel):
bl_label = "Display" bl_label = "Display"

8
release/scripts/startup/bl_ui/properties_data_speaker.py
View File

@@ -66,10 +66,7 @@ class DATA_PT_speaker(DataButtonsPanel, bpy.types.Panel):
split.template_ID(speaker, "sound", open="sound.open_mono") split.template_ID(speaker, "sound", open="sound.open_mono")
split.prop(speaker, "muted") split.prop(speaker, "muted")
split = layout.split() row = layout.row()
row = split.row()
row.prop(speaker, "volume") row.prop(speaker, "volume")
row.prop(speaker, "pitch") row.prop(speaker, "pitch")
@@ -84,15 +81,14 @@ class DATA_PT_distance(DataButtonsPanel, bpy.types.Panel):
speaker = context.speaker speaker = context.speaker
split = layout.split() split = layout.split()
col = split.column()
col = split.column()
col.label("Volume:") col.label("Volume:")
col.prop(speaker, "volume_min", text="Minimum") col.prop(speaker, "volume_min", text="Minimum")
col.prop(speaker, "volume_max", text="Maximum") col.prop(speaker, "volume_max", text="Maximum")
col.prop(speaker, "attenuation") col.prop(speaker, "attenuation")
col = split.column() col = split.column()
col.label("Distance:") col.label("Distance:")
col.prop(speaker, "distance_max", text="Maximum") col.prop(speaker, "distance_max", text="Maximum")
col.prop(speaker, "distance_reference", text="Reference") col.prop(speaker, "distance_reference", text="Reference")

5
release/scripts/startup/bl_ui/properties_object_constraint.py
View File

@@ -235,7 +235,6 @@ class ConstraintButtonsPanel():
row.label() row.label()
def LIMIT_ROTATION(self, context, layout, con): def LIMIT_ROTATION(self, context, layout, con):
split = layout.split() split = layout.split()
col = split.column(align=True) col = split.column(align=True)
@@ -259,9 +258,7 @@ class ConstraintButtonsPanel():
sub.prop(con, "min_z", text="Min") sub.prop(con, "min_z", text="Min")
sub.prop(con, "max_z", text="Max") sub.prop(con, "max_z", text="Max")
row = layout.row() layout.prop(con, "use_transform_limit")
row.prop(con, "use_transform_limit")
row.label()
row = layout.row() row = layout.row()
row.label(text="Convert:") row.label(text="Convert:")

9
release/scripts/startup/bl_ui/properties_render.py
View File

@@ -592,12 +592,9 @@ class RENDER_PT_encoding(RenderButtonsPanel, Panel):
if rd.ffmpeg_format not in {'MP3'}: if rd.ffmpeg_format not in {'MP3'}:
layout.prop(rd, "ffmpeg_audio_codec", text="Audio Codec") layout.prop(rd, "ffmpeg_audio_codec", text="Audio Codec")
split = layout.split() row = layout.row()
row.prop(rd, "ffmpeg_audio_bitrate")
col = split.column() row.prop(rd, "ffmpeg_audio_volume", slider=True)
col.prop(rd, "ffmpeg_audio_bitrate")
col = split.column()
col.prop(rd, "ffmpeg_audio_volume", slider=True)
class RENDER_PT_bake(RenderButtonsPanel, Panel): class RENDER_PT_bake(RenderButtonsPanel, Panel):

2
release/scripts/startup/bl_ui/properties_scene.py
View File

@@ -59,14 +59,12 @@ class SCENE_PT_audio(SceneButtonsPanel, Panel):
split = layout.split() split = layout.split()
col = split.column() col = split.column()
col.label("Listener:") col.label("Listener:")
col.prop(scene, "audio_distance_model", text="") col.prop(scene, "audio_distance_model", text="")
col.prop(scene, "audio_doppler_speed", text="Speed") col.prop(scene, "audio_doppler_speed", text="Speed")
col.prop(scene, "audio_doppler_factor", text="Doppler") col.prop(scene, "audio_doppler_factor", text="Doppler")
col = split.column() col = split.column()
col.label("Format:") col.label("Format:")
col.prop(rd, "ffmpeg_audio_channels", text="") col.prop(rd, "ffmpeg_audio_channels", text="")
col.prop(rd, "ffmpeg_audio_mixrate", text="Rate") col.prop(rd, "ffmpeg_audio_mixrate", text="Rate")