[Bf-blender-cvs] [6bb825e0837] master: Fix T54580: Pointer buttons skip undo push
Campbell Barton
noreply at git.blender.org
Mon Dec 3 08:44:49 CET 2018
Commit: 6bb825e0837e5e090c32567d335fe677e33e5ab0
Author: Campbell Barton
Date: Mon Dec 3 18:43:33 2018 +1100
Branches: master
https://developer.blender.org/rB6bb825e0837e5e090c32567d335fe677e33e5ab0
Fix T54580: Pointer buttons skip undo push
===================================================================
M source/blender/editors/interface/interface.c
===================================================================
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;
More information about the Bf-blender-cvs
mailing list