From 808bd3ea25ff99ffb845d981cb39f3bcdcd1aaf0 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Wed, 23 Nov 2011 19:05:52 +0000 Subject: 2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property. --- source/blender/editors/space_image/image_buttons.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'source/blender/editors/space_image/image_buttons.c') diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index 71cfa5128af..6c68ba0ea71 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -791,16 +791,15 @@ 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, *colsub, *rowsub; + uiLayout *col, *row, *split, *sub; col= uiLayoutColumn(layout, 0); - 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); + split= uiLayoutSplit(col, 0.5f, 0); + + uiItemR(split, imfptr, "file_format", 0, "", ICON_NONE); + sub= uiLayoutRow(split, 0); + uiItemR(sub, imfptr, "color_mode", UI_ITEM_R_EXPAND, "Color", ICON_NONE); /* only display depth setting if multiple depths can be used */ if((ELEM6(depth_ok, -- cgit v1.2.3