diff options
author | Julian Eisel <julian@blender.org> | 2022-05-12 16:53:12 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2022-05-12 17:56:14 +0300 |
commit | 3693e1d8e80501c6efcb8f732107742f80acf773 (patch) | |
tree | 2fc6177061859beff71ffd3413fad4131724be82 /source/blender/editors/interface/interface_anim.c | |
parent | c31f519954f2b21fecc86b1b3b9386685226dbdc (diff) |
Revert commits to increase button flag bitfield size
This reverts the commits 8d9d5da13706b668b9bd0d631e00c9b00b73f3ea,
59cd616534b46ab85b4324a0886bd9eb8876a48b and
98a04ed4524234b1840dc039c2f356db5ac57f26.
The commits are causing issues with MSVC, see D14926. I'm working on a
different solution, but that will need some work.
Diffstat (limited to 'source/blender/editors/interface/interface_anim.c')
-rw-r--r-- | source/blender/editors/interface/interface_anim.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_anim.c b/source/blender/editors/interface/interface_anim.c index b77d48552c7..e838ce37d8e 100644 --- a/source/blender/editors/interface/interface_anim.c +++ b/source/blender/editors/interface/interface_anim.c @@ -144,7 +144,7 @@ void ui_but_anim_decorate_update_from_flag(uiButDecorator *decorator_but) return; } - const uint64_t flag = but_anim->flag; + const int flag = but_anim->flag; if (flag & UI_BUT_DRIVEN) { but->icon = ICON_DECORATE_DRIVER; @@ -162,7 +162,7 @@ void ui_but_anim_decorate_update_from_flag(uiButDecorator *decorator_but) but->icon = ICON_DECORATE; } - const uint64_t flag_copy = (UI_BUT_DISABLED | UI_BUT_INACTIVE); + const int flag_copy = (UI_BUT_DISABLED | UI_BUT_INACTIVE); but->flag = (but->flag & ~flag_copy) | (flag & flag_copy); } |