Merge branch 'master' into blender2.8
This commit is contained in:
commit
d89faac7d2
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue