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

Merged changes in the trunk up to revision 33765.

Browse Source
This commit is contained in:
Tamito Kajiyama
2010-12-18 11:49:12 +00:00
parent c4e41d7371 a934116298
commit 3368a595da
469 changed files with 9113 additions and 11515 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
release/scripts/ui/properties_render.py
View File

@@ -819,6 +819,7 @@ class RENDER_PT_dimensions(RenderButtonsPanel, bpy.types.Panel):
row.menu("RENDER_MT_presets", text=bpy.types.RENDER_MT_presets.bl_label)
row.operator("render.preset_add", text="", icon="ZOOMIN")
row.operator("render.preset_add", text="", icon="ZOOMOUT").remove_active = True
split = layout.split()
col = split.column()
@@ -846,8 +847,6 @@ class RENDER_PT_dimensions(RenderButtonsPanel, bpy.types.Panel):
sub.prop(scene, "frame_step", text="Step")
sub.label(text="Frame Rate:")
sub = col.column(align=True)
sub.prop(rd, "fps")
sub.prop(rd, "fps_base", text="/")
subrow = sub.row(align=True)