Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <julian@blender.org>2020-08-05 13:12:05 +0300
committerJulian Eisel <julian@blender.org>2020-08-05 13:19:14 +0300
commitc3113724ed7e0b758f381ddef4270ad129ff93e1 (patch)
treeae0f38c37af0b1d33ecfd43e3de6363c6a73f0ba
parentde53178b26d3d2580a99faaf858731f3c9e09b2f (diff)
Fix T78630: Custom icons not grayed out in inactive layouts
For regular icons this worked because they used the text color, which was already grayed out by the caller.
-rw-r--r--source/blender/editors/interface/interface_widgets.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 2bc2ed5f5e8..f1811031cc7 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1401,7 +1401,7 @@ static void widget_draw_icon(
}
}
else if (ELEM(but->type, UI_BTYPE_BUT)) {
- if (but->flag & UI_BUT_DISABLED) {
+ if (but->flag & (UI_BUT_DISABLED | UI_BUT_INACTIVE)) {
alpha *= 0.5f;
}
}