[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34918] trunk/blender/release/scripts/ui: 2.5 UI Interface Scripts:
Thomas Dinges
blender at dingto.de
Wed Feb 16 21:29:24 CET 2011
Revision: 34918
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34918
Author: dingto
Date: 2011-02-16 20:29:23 +0000 (Wed, 16 Feb 2011)
Log Message:
-----------
2.5 UI Interface Scripts:
* Code cleanup, seriously we have a lot of unnecessary code!
* Small modification for OpenEXR buttons.
Modified Paths:
--------------
trunk/blender/release/scripts/ui/properties_data_camera.py
trunk/blender/release/scripts/ui/properties_render.py
Modified: trunk/blender/release/scripts/ui/properties_data_camera.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_camera.py 2011-02-16 20:04:32 UTC (rev 34917)
+++ trunk/blender/release/scripts/ui/properties_data_camera.py 2011-02-16 20:29:23 UTC (rev 34918)
@@ -95,12 +95,10 @@
layout.label(text="Depth of Field:")
split = layout.split()
+ split.prop(cam, "dof_object", text="")
col = split.column()
- col.prop(cam, "dof_object", text="")
- col = split.column()
-
if cam.dof_object != None:
col.enabled = False
col.prop(cam, "dof_distance", text="Distance")
Modified: trunk/blender/release/scripts/ui/properties_render.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_render.py 2011-02-16 20:04:32 UTC (rev 34917)
+++ trunk/blender/release/scripts/ui/properties_render.py 2011-02-16 20:29:23 UTC (rev 34918)
@@ -62,14 +62,10 @@
rd = context.scene.render
- split = layout.split()
+ row = layout.row()
+ row.operator("render.render", text="Image", icon='RENDER_STILL')
+ row.operator("render.render", text="Animation", icon='RENDER_ANIMATION').animation = True
- col = split.column()
- col.operator("render.render", text="Image", icon='RENDER_STILL')
-
- col = split.column()
- col.operator("render.render", text="Animation", icon='RENDER_ANIMATION').animation = True
-
layout.prop(rd, "display_mode", text="Display")
@@ -293,6 +289,7 @@
layout.prop(rd, "filepath", text="")
split = layout.split()
+
col = split.column()
col.prop(rd, "file_format", text="")
col.row().prop(rd, "color_mode", text="Color", expand=True)
@@ -303,36 +300,22 @@
col.prop(rd, "use_placeholder")
if file_format in ('AVI_JPEG', 'JPEG'):
- split = layout.split()
- split.prop(rd, "file_quality", slider=True)
+ layout.prop(rd, "file_quality", slider=True)
if file_format == 'PNG':
- split = layout.split()
- split.prop(rd, "file_quality", slider=True, text="Compression")
+ layout.prop(rd, "file_quality", slider=True, text="Compression")
+
+ if file_format in ('OPEN_EXR', 'MULTILAYER'):
+ row = layout.row()
+ row.prop(rd, "exr_codec", text="Codec")
+
+ if file_format == 'OPEN_EXR':
+ row = layout.row()
+ row.prop(rd, "use_exr_half")
+ row.prop(rd, "exr_zbuf")
+ row.prop(rd, "exr_preview")
- elif file_format == 'MULTILAYER':
- split = layout.split()
- col = split.column()
- col.label(text="Codec:")
- col.prop(rd, "exr_codec", text="")
- col = split.column()
-
- elif file_format == 'OPEN_EXR':
- split = layout.split()
-
- col = split.column()
- col.label(text="Codec:")
- col.prop(rd, "exr_codec", text="")
-
- subsplit = split.split()
- col = subsplit.column()
- col.prop(rd, "use_exr_half")
- col.prop(rd, "exr_zbuf")
-
- col = subsplit.column()
- col.prop(rd, "exr_preview")
-
elif file_format == 'JPEG2000':
split = layout.split()
col = split.column()
@@ -359,12 +342,10 @@
'''
elif file_format == 'TIFF':
- split = layout.split()
- split.prop(rd, "use_tiff_16bit")
+ layout.prop(rd, "use_tiff_16bit")
elif file_format == 'QUICKTIME_CARBON':
- split = layout.split()
- split.operator("scene.render_data_set_quicktime_codec")
+ layout.operator("scene.render_data_set_quicktime_codec")
elif file_format == 'QUICKTIME_QTKIT':
split = layout.split()
@@ -376,12 +357,10 @@
col.prop(rd, "quicktime_audiocodec_type", text="Audio Codec")
if rd.quicktime_audiocodec_type != 'No audio':
split = layout.split()
- col = split.column()
if rd.quicktime_audiocodec_type == 'LPCM':
- col.prop(rd, "quicktime_audio_bitdepth", text="")
+ split.prop(rd, "quicktime_audio_bitdepth", text="")
- col = split.column()
- col.prop(rd, "quicktime_audio_samplerate", text="")
+ split.prop(rd, "quicktime_audio_samplerate", text="")
split = layout.split()
col = split.column()
@@ -416,23 +395,16 @@
layout.menu("RENDER_MT_ffmpeg_presets", text="Presets")
split = layout.split()
-
- col = split.column()
- col.prop(rd, "ffmpeg_format")
+ split.prop(rd, "ffmpeg_format")
if rd.ffmpeg_format in ('AVI', 'QUICKTIME', 'MKV', 'OGG'):
- col = split.column()
- col.prop(rd, "ffmpeg_codec")
+ split.prop(rd, "ffmpeg_codec")
else:
split.label()
- split = layout.split()
+ row = layout.row()
+ row.prop(rd, "ffmpeg_video_bitrate")
+ row.prop(rd, "ffmpeg_gopsize")
- col = split.column()
- col.prop(rd, "ffmpeg_video_bitrate")
-
- col = split.column()
- col.prop(rd, "ffmpeg_gopsize")
-
split = layout.split()
col = split.column()
@@ -442,28 +414,24 @@
col.prop(rd, "ffmpeg_buffersize", text="Buffer")
col = split.column()
-
col.prop(rd, "ffmpeg_autosplit")
col.label(text="Mux:")
col.prop(rd, "ffmpeg_muxrate", text="Rate")
col.prop(rd, "ffmpeg_packetsize", text="Packet Size")
+
+ layout.separator()
# Audio:
- sub = layout.column()
-
if rd.ffmpeg_format not in ('MP3', ):
- sub.prop(rd, "ffmpeg_audio_codec", text="Audio Codec")
+ layout.prop(rd, "ffmpeg_audio_codec", text="Audio Codec")
- sub.separator()
+ split = layout.split()
- split = sub.split()
-
col = split.column()
col.prop(rd, "ffmpeg_audio_bitrate")
col.prop(rd, "ffmpeg_audio_mixrate")
- col = split.column()
- col.prop(rd, "ffmpeg_audio_volume", slider=True)
+ split.prop(rd, "ffmpeg_audio_volume", slider=True)
class RENDER_PT_antialiasing(RenderButtonsPanel, bpy.types.Panel):
More information about the Bf-blender-cvs
mailing list