diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-23 21:14:29 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-23 21:14:29 +0400 |
commit | 28fb329419b4e636bb9540ba090de8e2c28d582f (patch) | |
tree | b510b929ef1a2b16216d9b60bd29595470005164 /source/blender/editors | |
parent | a91bd43d382b857abb4440fe5a2353a4fac0519d (diff) |
minor changes
- avoid duplicate image enum definitions.
- move image UI format & bw/rgb/rgba onto 1 line.
- add 'make config' convenience target to run ccmake or cmake-gui
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/space_image/image_buttons.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index 720102a2b7c..71cfa5128af 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -791,14 +791,16 @@ void uiTemplateImageSettings(uiLayout *layout, PointerRNA *imfptr) /* some settings depend on this being a scene thats rendered */ const short is_render_out= (id && GS(id->name) == ID_SCE); - uiLayout *col, *row; + uiLayout *col, *row, *colsub, *rowsub; 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); + row= uiLayoutSplit(col, 0.5f, 0); + colsub= uiLayoutColumn(row, 0); + uiItemR(colsub, imfptr, "file_format", 0, "", ICON_NONE); + colsub= uiLayoutColumn(row, 0); + rowsub= uiLayoutRow(colsub, 0); + uiItemR(rowsub, imfptr, "color_mode", UI_ITEM_R_EXPAND, "Color", ICON_NONE); /* only display depth setting if multiple depths can be used */ if((ELEM6(depth_ok, |