diff options
author | Thomas Dinges <blender@dingto.org> | 2011-11-22 21:14:47 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2011-11-22 21:14:47 +0400 |
commit | 04fe6fc76472c894e5e78d079b84cac112e782b1 (patch) | |
tree | e865bbc6cf36d4e49006d3420ef44f86232bfa4f | |
parent | eb2baf9abc7b182acd9b4c0ba2e002441705f77c (diff) |
* UI Improvements for the uiTemplateImageSettings.
-rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 16 | ||||
-rw-r--r-- | source/blender/editors/space_image/image_buttons.c | 17 |
2 files changed, 16 insertions, 17 deletions
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 100f5b1730f..2d731164713 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -456,16 +456,12 @@ class RENDER_PT_output(RenderButtonsPanel, Panel): file_format = rd.image_settings.file_format layout.prop(rd, "filepath", text="") - - 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) + + flow = layout.column_flow() + flow.prop(rd, "use_overwrite") + flow.prop(rd, "use_placeholder") + flow.prop(rd, "use_file_extension") if file_format == 'QUICKTIME_CARBON': layout.operator("scene.render_data_set_quicktime_codec") diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index 11a9c0d8d40..adedcde66a6 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -830,7 +830,7 @@ void uiTemplateImageSettings(uiLayout *layout, PointerRNA *imfptr) col= uiLayoutColumn(layout, 0); uiItemR(col, imfptr, "file_format", 0, "", ICON_NONE); - + row= uiLayoutRow(col, 0); uiItemR(row, imfptr, "color_mode", UI_ITEM_R_EXPAND, "Color", ICON_NONE); @@ -858,24 +858,27 @@ void uiTemplateImageSettings(uiLayout *layout, PointerRNA *imfptr) if (ELEM(imf->imtype, R_IMF_IMTYPE_OPENEXR, R_IMF_IMTYPE_MULTILAYER)) { uiItemR(col, imfptr, "exr_codec", 0, NULL, ICON_NONE); } - + + row= uiLayoutRow(col, 0); if (BKE_imtype_supports_zbuf(imf->imtype)) { - uiItemR(col, imfptr, "use_zbuffer", 0, NULL, ICON_NONE); + uiItemR(row, imfptr, "use_zbuffer", 0, NULL, ICON_NONE); } if (is_render_out && (imf->imtype == R_IMF_IMTYPE_OPENEXR)) { - uiItemR(col, imfptr, "use_preview", 0, NULL, ICON_NONE); + uiItemR(row, imfptr, "use_preview", 0, NULL, ICON_NONE); } if (imf->imtype == R_IMF_IMTYPE_JP2) { + row= uiLayoutRow(col, 0); + uiItemR(row, imfptr, "use_jpeg2k_cinema_preset", 0, NULL, ICON_NONE); + uiItemR(row, imfptr, "use_jpeg2k_cinema_48", 0, NULL, ICON_NONE); + uiItemR(col, imfptr, "use_jpeg2k_ycc", 0, NULL, ICON_NONE); - uiItemR(col, imfptr, "use_jpeg2k_cinema_preset", 0, NULL, ICON_NONE); - uiItemR(col, imfptr, "use_jpeg2k_cinema_48", 0, NULL, ICON_NONE); } if (imf->imtype == R_IMF_IMTYPE_CINEON) { #if 1 - uiItemL(col, "FIXME: hard coded Non-Linear, Gamma:1.0", ICON_NONE); + uiItemL(col, "Hard coded Non-Linear, Gamma:1.0", ICON_NONE); #else uiItemR(col, imfptr, "use_cineon_log", 0, NULL, ICON_NONE); uiItemR(col, imfptr, "cineon_black", 0, NULL, ICON_NONE); |