[Bf-blender-cvs] [bc1eb513ab9] master: Fix buttons not being grayed out
Julian Eisel
noreply at git.blender.org
Tue May 24 11:31:30 CEST 2022
Commit: bc1eb513ab946c74ea6e535ba8b92a089bebf12f
Author: Julian Eisel
Date: Tue May 24 11:27:56 2022 +0200
Branches: master
https://developer.blender.org/rBbc1eb513ab946c74ea6e535ba8b92a089bebf12f
Fix buttons not being grayed out
Was using the wrong bitfield in flag comparisons for the drawing code.
The input handling wouldn't be affected. Own mistake in 0d7311345295.
===================================================================
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 e53d90a233e..3777ff31b26 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1302,14 +1302,14 @@ static void widgetbase_draw(uiWidgetBase *wtb, const uiWidgetColors *wcol)
static float widget_alpha_factor(const uiWidgetStateInfo *state)
{
- if (state->but_drawflag & (UI_BUT_INACTIVE | UI_BUT_DISABLED)) {
- if (state->but_drawflag & UI_SEARCH_FILTER_NO_MATCH) {
+ if (state->but_flag & (UI_BUT_INACTIVE | UI_BUT_DISABLED)) {
+ if (state->but_flag & UI_SEARCH_FILTER_NO_MATCH) {
return 0.25f;
}
return 0.5f;
}
- if (state->but_drawflag & UI_SEARCH_FILTER_NO_MATCH) {
+ if (state->but_flag & UI_SEARCH_FILTER_NO_MATCH) {
return 0.5f;
}
More information about the Bf-blender-cvs
mailing list