From 6bb825e0837e5e090c32567d335fe677e33e5ab0 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 3 Dec 2018 18:43:33 +1100 Subject: Fix T54580: Pointer buttons skip undo push --- source/blender/editors/interface/interface.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 3188829bf31..ab87e1dda55 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -3580,8 +3580,16 @@ static uiBut *ui_def_but_rna( ui_def_but_icon(but, icon, UI_HAS_ICON); } - if ((type == UI_BTYPE_MENU) && (but->dt == UI_EMBOSS_PULLDOWN)) { - but->flag |= UI_BUT_ICON_SUBMENU; + if (type == UI_BTYPE_MENU) { + if (but->dt == UI_EMBOSS_PULLDOWN) { + but->flag |= UI_BUT_ICON_SUBMENU; + } + } + else if (type == UI_BTYPE_SEARCH_MENU) { + if (proptype == PROP_POINTER) { + /* Search buttons normally don't get undo, see: T54580. */ + but->flag |= UI_BUT_UNDO; + } } const char *info; -- cgit v1.2.3