From b550cd8c1e94e649a845b78e6a47c197bcd68766 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Sun, 4 Dec 2011 16:55:46 +0000 Subject: [PATCH] Fix [#29502] Brush texture Preview panel doesnt show Alpha checkbox * Added to the py UI file, it would require some deeper changes to have it in the c Template, can be done later. * Fixed a typo. --- release/scripts/startup/bl_ui/properties_texture.py | 4 ++++ source/blender/editors/interface/interface_templates.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py index 9f67edd7653..d16b2f15f52 100644 --- a/release/scripts/startup/bl_ui/properties_texture.py +++ b/release/scripts/startup/bl_ui/properties_texture.py @@ -166,6 +166,10 @@ class TEXTURE_PT_preview(TextureButtonsPanel, Panel): layout.template_preview(tex, parent=idblock, slot=slot) else: layout.template_preview(tex, slot=slot) + + #Show Alpha Button for Brush Textures, see #29502 + if context.space_data.texture_context == 'BRUSH': + layout.prop(tex, "use_preview_alpha") class TEXTURE_PT_colors(TextureButtonsPanel, Panel): diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index eb7e06623f7..7f01d4f031d 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -1223,7 +1223,7 @@ void uiTemplatePreview(uiLayout *layout, ID *id, int show_buttons, ID *parent, M uiDefButS(block, ROW, B_MATPRV, IFACE_("World"), 0, 0,UI_UNIT_X*10,UI_UNIT_Y, pr_texture, 10, TEX_PR_OTHER, 0, 0, ""); uiDefButS(block, ROW, B_MATPRV, IFACE_("Both"), 0, 0,UI_UNIT_X*10,UI_UNIT_Y, pr_texture, 10, TEX_PR_BOTH, 0, 0, ""); - /* Alpha buton for texture preview */ + /* Alpha button for texture preview */ if(*pr_texture!=TEX_PR_OTHER) { row = uiLayoutRow(layout, 0); uiItemR(row, &texture_ptr, "use_preview_alpha", 0, NULL, ICON_NONE);