Commit: d89faac7d2a3993493468a2d8eccd4ff7705c857
Author: Campbell Barton
Date: Mon Dec 3 19:31:54 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBd89faac7d2a3993493468a2d8eccd4ff7705c857
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/editors/interface/interface.c
index 6efd6acf59d,ab87e1dda55..f9d17386be6
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@@ -3749,8 -3580,16 +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) {
- but->flag |= UI_BUT_ICON_SUBMENU;
++ 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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
