Merge branch 'blender-v3.0-release'
This commit is contained in:
commit
db43d19c16
|
@ -187,7 +187,7 @@ const bTheme U_theme_default = {
|
|||
.outline = RGBA(0x2d2d2dff),
|
||||
.inner = RGBA(0x2d2d2d00),
|
||||
.inner_sel = RGBA(0x484a4fff),
|
||||
.item = RGBA(0xb3b3b3ff),
|
||||
.item = RGBA(0x4772b3ff),
|
||||
.text = RGBA(0xccccccff),
|
||||
.text_sel = RGBA(0xffffffff),
|
||||
.roundness = 0.2f,
|
||||
|
|
|
@ -2526,7 +2526,7 @@ static void widget_state(uiWidgetType *wt, int state, int drawflag, eUIEmbossTyp
|
|||
{
|
||||
uiWidgetStateColors *wcol_state = wt->wcol_state;
|
||||
|
||||
if ((state & UI_BUT_LIST_ITEM) && !(state & UI_STATE_TEXT_INPUT)) {
|
||||
if (state & UI_BUT_LIST_ITEM) {
|
||||
/* Override default widget's colors. */
|
||||
bTheme *btheme = UI_GetTheme();
|
||||
wt->wcol_theme = &btheme->tui.wcol_list_item;
|
||||
|
|
Loading…
Reference in New Issue