diff options
author | Hans Goudey <h.goudey@me.com> | 2021-07-13 18:48:37 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2021-07-13 18:48:37 +0300 |
commit | 903b786f69af342c5eda5c58ab25d827369c09cb (patch) | |
tree | 7f407a929a068c92df1860d0083897b426e04318 /source/blender/editors/interface/interface.c | |
parent | 56ca4fe5bb3c3d8cd92a1c99fc83856aaefdd0c2 (diff) | |
parent | 2373a2196e21b35998961fff2f53c5fa98036cd8 (diff) |
Merge branch 'master' into refactor-vertex-group-namesrefactor-vertex-group-names
Diffstat (limited to 'source/blender/editors/interface/interface.c')
-rw-r--r-- | source/blender/editors/interface/interface.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index e9784a59d70..32b86119753 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -3542,7 +3542,7 @@ uiBlock *UI_block_begin(const bContext *C, ARegion *region, const char *name, eU return block; } -char UI_block_emboss_get(uiBlock *block) +eUIEmbossType UI_block_emboss_get(uiBlock *block) { return block->emboss; } @@ -4106,7 +4106,6 @@ static uiBut *ui_def_but(uiBlock *block, UI_BTYPE_BLOCK, UI_BTYPE_BUT_MENU, UI_BTYPE_SEARCH_MENU, - UI_BTYPE_PROGRESS_BAR, UI_BTYPE_DATASETROW, UI_BTYPE_POPOVER)) { but->drawflag |= (UI_BUT_TEXT_LEFT | UI_BUT_ICON_LEFT); |