diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-19 01:45:29 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-19 01:45:29 +0400 |
| commit | 29b7b344fc48ed31b1e36818ab4767090691d6e2 (patch) | |
| tree | 2c7496c8c656565d2ac6dc0901e1af66f8565101 /release/scripts/startup/bl_ui/properties_render.py | |
| parent | c1ceab1281ccf061f03f8000bf190a082a5385d8 (diff) | |
| parent | 7bfef29f2f2a1b262d28abdc6e30fcd9c1f1caad (diff) | |
svn merge ^/trunk/blender -r55357:55372
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_render.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 969cb8d4cad..0d331781019 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -390,10 +390,14 @@ class RENDER_PT_output(RenderButtonsPanel, Panel): 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.active = not rd.is_movie_format + col.prop(rd, "use_overwrite") + col.prop(rd, "use_placeholder") + + split.prop(rd, "use_file_extension") layout.template_image_settings(image_settings, color_management=False) |