[Bf-blender-cvs] [d53d78ac45b] blender2.8: UI: correct decorator buttons 'enabled' flag

Campbell Barton noreply at git.blender.org
Sun Jun 17 12:15:56 CEST 2018


Commit: d53d78ac45b53e952824d1332be977478692129c
Author: Campbell Barton
Date:   Sun Jun 17 12:08:33 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBd53d78ac45b53e952824d1332be977478692129c

UI: correct decorator buttons 'enabled' flag

===================================================================

M	source/blender/editors/interface/interface_anim.c

===================================================================

diff --git a/source/blender/editors/interface/interface_anim.c b/source/blender/editors/interface/interface_anim.c
index 624ba5dd55d..82fe32e3747 100644
--- a/source/blender/editors/interface/interface_anim.c
+++ b/source/blender/editors/interface/interface_anim.c
@@ -122,6 +122,9 @@ void ui_but_anim_decorate_update_from_flag(uiBut *but)
 	else {
 		but->icon = ICON_DOT;
 	}
+
+	const int flag_copy = (UI_BUT_DISABLED | UI_BUT_INACTIVE);
+	but->flag = (but->flag & ~flag_copy) | (flag & flag_copy);
 }
 
 /**



More information about the Bf-blender-cvs mailing list