diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c index 9545de18e27..8e4d915d2f8 100644 --- a/source/blender/src/buttons_editing.c +++ b/source/blender/src/buttons_editing.c @@ -1143,7 +1143,7 @@ static void draw_modifier(uiBlock *block, Object *ob, ModifierData *md, int *xco uiBlockSetCol(block, color); /* roundbox 4 free variables: corner-rounding, nop, roundbox type, shade */ uiDefBut(block, ROUNDBOX, 0, "", x-10, y-4, width, 25, NULL, 7.0, 0.0, - (!isVirtual && (md->mode&eModifierMode_Expanded))?3:15, -20, ""); + (!isVirtual && (md->mode&eModifierMode_Expanded))?3:15, 20, ""); uiBlockSetCol(block, TH_AUTO); /* open/close icon */ @@ -1248,7 +1248,7 @@ static void draw_modifier(uiBlock *block, Object *ob, ModifierData *md, int *xco } /* roundbox 4 free variables: corner-rounding, nop, roundbox type, shade */ - uiDefBut(block, ROUNDBOX, 0, "", x-10, y-height-2, width, height-2, NULL, 5.0, 0.0, 12, 0, ""); + uiDefBut(block, ROUNDBOX, 0, "", x-10, y-height-2, width, height-2, NULL, 5.0, 0.0, 12, 40, ""); y -= 18; diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c index 296970107b0..497fc9a211e 100644 --- a/source/blender/src/buttons_object.c +++ b/source/blender/src/buttons_object.c @@ -192,6 +192,8 @@ static void enable_constraint_ipo_func (void *ob_v, void *con_v) bConstraintChannel *chan; ListBase *conbase; + constraint_active_func(ob_v, con_v); + conbase = get_active_constraint_channels(ob, 1); // 1 == create if (!conbase) @@ -228,6 +230,7 @@ static void add_influence_key_to_constraint_func (void *ob_v, void *con_v) ListBase *conbase; IpoCurve *icu; + constraint_active_func(ob_v, con_v); conbase = get_active_constraint_channels(ob, 1); // 1=make if (!conbase) @@ -430,7 +433,7 @@ static void draw_constraint (uiBlock *block, ListBase *list, bConstraint *con, s uiBlockSetEmboss(block, UI_EMBOSSN); /* rounded header */ - rb_col= (con->flag & CONSTRAINT_ACTIVE)?10:-10; + rb_col= (con->flag & CONSTRAINT_ACTIVE)?40:20; uiDefBut(block, ROUNDBOX, B_DIFF, "", *xco-10, *yco-1, width+40, 22, NULL, 5.0, 0.0, (con->flag & CONSTRAINT_EXPAND)?3:15 , rb_col-20, ""); diff --git a/source/blender/src/interface_draw.c b/source/blender/src/interface_draw.c index 84f200a490d..81e191ee17c 100644 --- a/source/blender/src/interface_draw.c +++ b/source/blender/src/interface_draw.c @@ -1830,11 +1830,15 @@ static void ui_draw_but_CHARTAB(uiBut *but) static void ui_draw_roundbox(uiBut *but) { - BIF_ThemeColorShade(but->themecol, but->a2); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glEnable(GL_BLEND); + + BIF_ThemeColorShadeAlpha(TH_PANEL, but->a2, but->a2); uiSetRoundBox(but->a1); gl_round_box(GL_POLYGON, but->x1, but->y1, but->x2, but->y2, but->min); + glDisable(GL_BLEND); }