diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-05-12 05:53:48 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-05-12 05:53:48 +0300 |
| commit | 9947b1fda69ccc4f6fd2310d5ce603dc32a55a94 (patch) | |
| tree | 9f22816a90364086d2c35eb8c1a23bb9fb7f96e6 /source/blender/editors/interface/interface_widgets.c | |
| parent | 1e12468b84d23e690eab0f5434d894e945694305 (diff) | |
| parent | 8770f3530592d8fa7fea52a37666c2680d553d3a (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/editors/interface/interface_widgets.c')
| -rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 231c2093143..4706be205e1 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -27,7 +27,6 @@ #include <string.h> #include "DNA_brush_types.h" -#include "DNA_screen_types.h" #include "DNA_userdef_types.h" #include "BLI_math.h" @@ -4659,7 +4658,7 @@ static int widget_roundbox_set(uiBut *but, rcti *rect) * \{ */ /* conversion from old to new buttons, so still messy */ -void ui_draw_but(const bContext *C, ARegion *region, uiStyle *style, uiBut *but, rcti *rect) +void ui_draw_but(const bContext *C, struct ARegion *region, uiStyle *style, uiBut *but, rcti *rect) { bTheme *btheme = UI_GetTheme(); const ThemeUI *tui = &btheme->tui; @@ -5094,7 +5093,10 @@ static void ui_draw_popover_back_impl(const uiWidgetColors *wcol, GPU_blend(false); } -void ui_draw_popover_back(ARegion *region, uiStyle *UNUSED(style), uiBlock *block, rcti *rect) +void ui_draw_popover_back(struct ARegion *region, + uiStyle *UNUSED(style), + uiBlock *block, + rcti *rect) { uiWidgetType *wt = widget_type(UI_WTYPE_MENU_BACK); |