2.5

More cleanup!

- removed old UI font completely, including from uiBeginBlock
- emboss hints for uiBlock only have three types now;
  Regular, Pulldown, or "Nothing" (only icon/text)
- removed old font path from Userdef
- removed all old button theme hinting
- removed old "auto block" to merge buttons in groups
  (was only in use for radiosity buttons)

And went over all warnings. One hooray for make giving clean output :)
Well, we need uniform definitions for warnings, so people at least fix
them... here's the real bad bugs I found:

- in mesh code, a call to editmesh mixed *em and *me
- in armature, ED_util.h was not included, so no warnings for wrong call
  to ED_undo_push()
- The extern Py api .h was not included in the bpy_interface.c, showing
  a several calls using different args.

Further just added the missing includes, and removed unused vars.

1 files changed, 6 insertions, 7 deletions

diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index e5e9706c25b..786d819674c 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -922,12 +922,11 @@ void uiTemplateSlot(uiLayout *layout, int slot)
 static void ui_layout_templates(const bContext *C, uiBlock *block, uiLayout *layout)
 {
 	uiTemplate *template;
-	int oldcolor= 0;
 
 	for(template=layout->templates.first; template; template=template->next) {
 		if(template->color) {
-			oldcolor= uiBlockGetCol(block);
-			uiBlockSetCol(block, template->color);
+			// XXX oldcolor= uiBlockGetCol(block);
+			// XXX uiBlockSetCol(block, template->color);
 		}
 
 		switch(template->type) {
@@ -954,8 +953,8 @@ static void ui_layout_templates(const bContext *C, uiBlock *block, uiLayout *lay
 				break;
 		}
 
-		if(template->color)
-			uiBlockSetCol(block, oldcolor);
+// XXX 		if(template->color)
+// XXX 			uiBlockSetCol(block, oldcolor);
 
 		if(layout->dir == UI_LAYOUT_HORIZONTAL)
 			layout->x += TEMPLATE_SPACE;
@@ -1038,7 +1037,7 @@ void uiRegionPanelLayout(const bContext *C, ARegion *ar, int vertical, char *con
 				continue;
 
 		if(pt->draw && (!pt->poll || pt->poll(C))) {
-			block= uiBeginBlock(C, ar, pt->idname, UI_EMBOSS, UI_HELV);
+			block= uiBeginBlock(C, ar, pt->idname, UI_EMBOSS);
 			
 			if(vertical)
 				w= (ar->type->minsizex)? ar->type->minsizex-12: block->aspect*ar->winx-12;
@@ -1103,7 +1102,7 @@ void uiRegionHeaderLayout(const bContext *C, ARegion *ar)
 
 	/* draw all headers types */
 	for(ht= ar->type->headertypes.first; ht; ht= ht->next) {
-		block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS, UI_HELV);
+		block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS);
 		layout= uiLayoutBegin(UI_LAYOUT_HORIZONTAL, xco, yco, 0, 24);
 
 		if(ht->draw)