diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-08 23:40:37 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-08 23:41:38 +0400 |
| commit | 7bcb34e59ba003f9f37fa7ed781b46bacddf3ba6 (patch) | |
| tree | 8027fbc6e1f7438ce7636789aadd6415129b1e9d /source/blender/editors/interface | |
| parent | 20b046d7639c6c95d942760f8004c449fc42b081 (diff) | |
Fix T38131: node link buttons (like for cycles in material properties) were not
giving correct colors with theme menu colors set to bright values.
Thanks to Denis Declara for finding the cause of this bug.
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index fbfc901a9e5..b7d7c093284 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -2847,12 +2847,12 @@ static void widget_menunodebut(uiWidgetColors *wcol, rcti *rect, int UNUSED(stat rad = 0.2f * U.widget_unit; round_box_edges(&wtb, roundboxalign, rect, rad); - wcol->inner[0] += 15; - wcol->inner[1] += 15; - wcol->inner[2] += 15; - wcol->outline[0] += 15; - wcol->outline[1] += 15; - wcol->outline[2] += 15; + wcol->inner[0] = min_ii(wcol->inner[0] + 15, 255); + wcol->inner[1] = min_ii(wcol->inner[1] + 15, 255); + wcol->inner[2] = min_ii(wcol->inner[2] + 15, 255); + wcol->outline[0] = min_ii(wcol->outline[0] + 15, 255); + wcol->outline[1] = min_ii(wcol->outline[1] + 15, 255); + wcol->outline[2] = min_ii(wcol->outline[2] + 15, 255); /* decoration */ widgetbase_draw(&wtb, wcol); |