From 187f664c7587d0d8f13b0e71bcc38dc2d7f97693 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Thu, 10 Oct 2013 23:33:59 +0000 Subject: [PATCH] Fix #37036, pack and refresh button not aligned anymore. Also add operator for opening images in the image editor header, it's easily one of the most common operations, don't see why it has to be only accessed from menu. --- release/scripts/startup/bl_ui/space_image.py | 2 +- source/blender/editors/space_image/image_buttons.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 99d0179d1da..17ed7b44cf1 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -390,7 +390,7 @@ class IMAGE_HT_header(Header): if show_maskedit: sub.menu("MASK_MT_mask") - layout.template_ID(sima, "image", new="image.new") + layout.template_ID(sima, "image", new="image.new", open="image.open") if not show_render: layout.prop(sima, "use_image_pin", text="") diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index 144d2c14e9f..3ff404d38a9 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -640,7 +640,7 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, const char else uiItemO(row, "", ICON_UGLYPACKAGE, "image.pack"); - row = uiLayoutRow(row, FALSE); + row = uiLayoutRow(row, TRUE); uiLayoutSetEnabled(row, ima->packedfile == NULL); uiItemR(row, &imaptr, "filepath", 0, "", ICON_NONE); uiItemO(row, "", ICON_FILE_REFRESH, "image.reload");