diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-22 22:15:08 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-22 22:15:08 +0400 |
| commit | ac814498a213d436c2349e8ff55fe802cdb7376e (patch) | |
| tree | 38c8e0ce3d844804cc6dbb35f068a315e207a8df /release | |
| parent | c6391e8d2394b8d022b03f48941b235b96d677d0 (diff) | |
| parent | b78701f6fe1daa33c38a7b72563565c09677f325 (diff) | |
svn merge ^/trunk/blender -r42069:42076
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 15 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d_toolbar.py | 2 |
2 files changed, 7 insertions, 10 deletions
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 100f5b1730f..57df602f19a 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -456,16 +456,13 @@ class RENDER_PT_output(RenderButtonsPanel, Panel): file_format = rd.image_settings.file_format layout.prop(rd, "filepath", text="") + + flow = layout.column_flow() + flow.prop(rd, "use_overwrite") + flow.prop(rd, "use_placeholder") + flow.prop(rd, "use_file_extension") - split = layout.split() - - col = split.column() - col.template_image_settings(rd.image_settings) - - col = split.column() - col.prop(rd, "use_file_extension") - col.prop(rd, "use_overwrite") - col.prop(rd, "use_placeholder") + layout.template_image_settings(rd.image_settings) if file_format == 'QUICKTIME_CARBON': layout.operator("scene.render_data_set_quicktime_codec") diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 5bcdbc1efe8..ddea7bd00fd 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -88,7 +88,7 @@ class VIEW3D_PT_tools_objectmode(View3DPanel, Panel): col.operator("object.join") active_object = context.active_object - if active_object and active_object.type == 'MESH': + if active_object and active_object.type in {'MESH', 'CURVE', 'SURFACE'}: col = layout.column(align=True) col.label(text="Shading:") |