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/view2d.cc | |
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/view2d.cc')
-rw-r--r-- | source/blender/editors/interface/view2d.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/view2d.cc b/source/blender/editors/interface/view2d.cc index 94190c0a39d..66171dc13e4 100644 --- a/source/blender/editors/interface/view2d.cc +++ b/source/blender/editors/interface/view2d.cc @@ -1532,7 +1532,7 @@ void UI_view2d_scrollers_draw(View2D *v2d, const rcti *mask_custom) uiWidgetColors wcol = btheme->tui.wcol_scroll; const float alpha_fac = v2d->alpha_hor / 255.0f; rcti slider; - uint64_t state; + int state; slider.xmin = scrollers.hor_min; slider.xmax = scrollers.hor_max; @@ -1566,7 +1566,7 @@ void UI_view2d_scrollers_draw(View2D *v2d, const rcti *mask_custom) uiWidgetColors wcol = btheme->tui.wcol_scroll; rcti slider; const float alpha_fac = v2d->alpha_vert / 255.0f; - uint64_t state; + int state; slider.xmin = vert.xmin; slider.xmax = vert.xmax; |