Commit: 4eeeae0edacc05f29c23c66fd2d1df2bbb492a5c
Author: Campbell Barton
Date: Tue Nov 11 10:55:07 2014 +0100
Branches: master
https://developer.blender.org/rB4eeeae0edacc05f29c23c66fd2d1df2bbb492a5c
UI: remove unused emboss-table define
===================================================================
M source/blender/editors/include/UI_interface.h
M source/blender/editors/interface/interface_widgets.c
M source/blender/editors/space_outliner/outliner_draw.c
===================================================================
diff --git a/source/blender/editors/include/UI_interface.h
b/source/blender/editors/include/UI_interface.h
index 9ba769b..313eea1 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 b402981..c9def07 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 f8890ce..377bd3a 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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
