diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-11-11 12:55:07 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-11-11 20:26:16 +0300 |
| commit | 4eeeae0edacc05f29c23c66fd2d1df2bbb492a5c (patch) | |
| tree | 005a3bdc1ca552bb332bfe08c8bb80af7f145e69 | |
| parent | 52d571e189d5ba48dbbc2ad0cf24608f30c6bbc2 (diff) | |
UI: remove unused emboss-table define
| -rw-r--r-- | source/blender/editors/include/UI_interface.h | 3 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index 9ba769bcfa0..313eea1b251 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -102,8 +102,7 @@ enum { UI_EMBOSS = 0, /* use widget style for drawing */ UI_EMBOSS_NONE = 1, /* Nothing, only icon and/or text */ UI_EMBOSS_PULLDOWN = 2, /* Pulldown menu style */ - UI_EMBOSS_TABLE = 3, /* Table */ - UI_EMBOSS_RADIAL = 4, /* Pie Menu */ + UI_EMBOSS_RADIAL = 3, /* Pie Menu */ }; /* uiBlock->direction */ diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index b402981dfde..c9def075666 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -3517,7 +3517,8 @@ void ui_draw_but(const bContext *C, ARegion *ar, uiStyle *style, uiBut *but, rct wt = widget_type(UI_WTYPE_MENU_ITEM_RADIAL); } else { - + BLI_assert(but->dt == UI_EMBOSS); + switch (but->type) { case UI_BTYPE_LABEL: if (but->block->flag & UI_BLOCK_LOOP) diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index f8890ceb9aa..377bd3ab431 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -775,8 +775,6 @@ static void outliner_draw_rnabuts(uiBlock *block, Scene *scene, ARegion *ar, Spa TreeStoreElem *tselem; PointerRNA *ptr; PropertyRNA *prop; - - UI_block_emboss_set(block, UI_EMBOSS_TABLE); for (te = lb->first; te; te = te->next) { tselem = TREESTORE(te); |