diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-12-03 11:31:54 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-03 11:31:54 +0300 |
commit | d89faac7d2a3993493468a2d8eccd4ff7705c857 (patch) | |
tree | 8db32c0e806be1f297b8001fb26b53f2742df5dc /source/blender | |
parent | 63d0ea8ecf488e330a6717365b685e1339498fdb (diff) | |
parent | 6bb825e0837e5e090c32567d335fe677e33e5ab0 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/interface/interface.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 6efd6acf59d..f9d17386be6 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -3749,8 +3749,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)) { - ui_but_submenu_enable(block, but); + if (type == UI_BTYPE_MENU) { + if (but->dt == UI_EMBOSS_PULLDOWN) { + ui_but_submenu_enable(block, but); + } + } + 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; |