[Bf-blender-cvs] [7bcb34e] master: Fix T38131: node link buttons (like for cycles in material properties) were not giving correct colors with theme menu colors set to bright values.
Brecht Van Lommel
noreply at git.blender.org
Wed Jan 8 20:42:24 CET 2014
Commit: 7bcb34e59ba003f9f37fa7ed781b46bacddf3ba6
Author: Brecht Van Lommel
Date: Wed Jan 8 20:40:37 2014 +0100
https://developer.blender.org/rB7bcb34e59ba003f9f37fa7ed781b46bacddf3ba6
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.
===================================================================
M source/blender/editors/interface/interface_widgets.c
===================================================================
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index fbfc901..b7d7c09 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);
More information about the Bf-blender-cvs
mailing list