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
path: root/source
diff options
context:
space:
mode:
authorJulian Eisel <julian@blender.org>2020-08-05 13:19:28 +0300
committerJulian Eisel <julian@blender.org>2020-08-05 13:19:28 +0300
commitfc9f7e3e51ae43a64917b7ef65e8210394220dfa (patch)
treefd4882774f97e667bfe5b4912db07867c0193af6 /source
parentec9ab00fcb6fa7bc2f2bcb7a11daadc527f83f41 (diff)
parentc3113724ed7e0b758f381ddef4270ad129ff93e1 (diff)
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'source')
-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 a339006bd08..d68a8f88686 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;
}
}