2.5
authorTon Roosendaal <ton@blender.org>
Tue, 14 Apr 2009 15:59:52 +0000 (15:59 +0000)
committerTon Roosendaal <ton@blender.org>
Tue, 14 Apr 2009 15:59:52 +0000 (15:59 +0000)
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.

53 files changed:
source/blender/blenlib/BLI_string.h
source/blender/blenlib/intern/string.c
source/blender/editors/armature/armature_intern.h
source/blender/editors/armature/editarmature_retarget.c
source/blender/editors/armature/reeb.c
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_draw.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/interface_layout.c
source/blender/editors/interface/interface_panel.c
source/blender/editors/interface/interface_regions.c
source/blender/editors/interface/interface_utils.c
source/blender/editors/mesh/editdeform.c
source/blender/editors/object/object_edit.c
source/blender/editors/screen/area.c
source/blender/editors/space_action/action_draw.c
source/blender/editors/space_action/action_header.c
source/blender/editors/space_buttons/buttons_header.c
source/blender/editors/space_buttons/buttons_scene.c
source/blender/editors/space_buttons/space_buttons.c
source/blender/editors/space_file/file_draw.c
source/blender/editors/space_file/file_header.c
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_file/filesel.c
source/blender/editors/space_graph/graph_buttons.c
source/blender/editors/space_graph/graph_header.c
source/blender/editors/space_image/image_header.c
source/blender/editors/space_image/image_panels.c
source/blender/editors/space_info/info_header.c
source/blender/editors/space_nla/nla_header.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/node_draw.c
source/blender/editors/space_node/node_header.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/space_outliner/outliner_header.c
source/blender/editors/space_script/script_header.c
source/blender/editors/space_script/space_script.c
source/blender/editors/space_sequencer/sequencer_header.c
source/blender/editors/space_sound/sound_header.c
source/blender/editors/space_text/text_header.c
source/blender/editors/space_time/time_header.c
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/transform/transform_constraints.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/util/editmode_undo.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/python/intern/bpy_interface.c
source/blender/python/intern/bpy_ui.c
source/blender/windowmanager/intern/wm_operators.c

index 22b41d0..ce9dd44 100644 (file)
@@ -84,14 +84,14 @@ char *BLI_sprintfN(const char *format, ...);
         * 
         * @retval True if the strings are equal, false otherwise.
         */
-int BLI_streq(char *a, char *b);
+int BLI_streq(const char *a, const char *b);
 
        /**
         * Compare two strings without regard to case.
         * 
         * @retval True if the strings are equal, false otherwise.
         */
-int BLI_strcaseeq(char *a, char *b);
+int BLI_strcaseeq(const char *a, const char *b);
 
 char *BLI_strcasestr(const char *s, const char *find);
 int BLI_strcasecmp(const char *s1, const char *s2);
index 8485a0c..843f6b6 100644 (file)
@@ -100,10 +100,13 @@ char *BLI_sprintfN(const char *format, ...)
        return n;
 }
 
-int BLI_streq(char *a, char *b) {
+int BLI_streq(const char *a, const char *b) 
+{
        return (strcmp(a, b)==0);
 }
-int BLI_strcaseeq(char *a, char *b) {
+
+int BLI_strcaseeq(const char *a, const char *b) 
+{
        return (BLI_strcasecmp(a, b)==0);
 }
 
index 486d276..ea28c64 100644 (file)
@@ -75,8 +75,8 @@ struct EditBone;
 struct ListBase;
 
 void make_boneList(struct ListBase *edbo, struct ListBase *bones, struct EditBone *parent);
-
 struct EditBone *addEditBone(struct bArmature *arm, char *name);
+void BIF_sk_selectStroke(struct bContext *C, short mval[2], short extend);
 
 /* duplicate method */
 void preEditBoneDuplicate(struct ListBase *editbones);
index 5fc8d52..4da7eaf 100644 (file)
@@ -64,9 +64,9 @@
 #include "BKE_context.h"
 
 #include "ED_armature.h"
+#include "ED_util.h"
+
 #include "BIF_retarget.h"
-//#include "BIF_space.h"
-//#include "BIF_toolbox.h"
 
 #include "PIL_time.h"
 
@@ -1645,6 +1645,7 @@ RigGraph *armatureSelectedToGraph(bContext *C, Object *ob, bArmature *arm)
 }
 /************************************ GENERATING *****************************************************/
 
+#if 0
 static EditBone *add_editbonetolist(char *name, ListBase *list)
 {
        EditBone *bone= MEM_callocN(sizeof(EditBone), "eBone");
@@ -1668,6 +1669,7 @@ static EditBone *add_editbonetolist(char *name, ListBase *list)
        
        return bone;
 }
+#endif
 
 void generateMissingArcsFromNode(RigGraph *rigg, ReebNode *node, int multi_level_limit)
 {
@@ -2733,7 +2735,7 @@ static void adjustGraphs(bContext *C, RigGraph *rigg)
        arm->edbo = rigg->editbones;
        ED_armature_from_edit(scene, rigg->ob);
        
-       ED_undo_push("Retarget Skeleton");
+       ED_undo_push(C, "Retarget Skeleton");
 }
 
 static void retargetGraphs(bContext *C, RigGraph *rigg)
@@ -2890,7 +2892,7 @@ void BIF_retargetArmature(bContext *C)
        printf("retarget: \t%.3f (%.1f%%)\n", retarget_time, retarget_time / total_time * 100);
        printf("-----------\n");
        
-       ED_undo_push("Retarget Skeleton");
+       ED_undo_push(C, "Retarget Skeleton");
 
        // XXX  
 //     allqueue(REDRAWVIEW3D, 0);
index a38b4de..5a63667 100644 (file)
@@ -1740,10 +1740,10 @@ int filterCyclesReebGraph(ReebGraph *rg, float distance_threshold)
 
 int filterSmartReebGraph(ReebGraph *rg, float threshold)
 {
-       ReebArc *arc = NULL, *nextArc = NULL;
        int value = 0;
+#if 0 //XXX
+       ReebArc *arc = NULL, *nextArc = NULL;
        
-       #if 0 //XXX
        BLI_sortlist(&rg->arcs, compareArcs);
 
 #ifdef DEBUG_REEB
@@ -3402,7 +3402,7 @@ ReebGraph *BIF_ReebGraphMultiFromEditMesh(bContext *C)
 
        if (weightFromDistance(em, &indexed_edges) == 0)
        {
-               error("No selected vertex\n");
+               // XXX error("No selected vertex\n");
                freeEdgeIndex(&indexed_edges);
                return NULL;
        }
index 37d6119..d6e451e 100644 (file)
@@ -57,14 +57,10 @@ typedef struct uiPopupBlockHandle uiPopupBlockHandle;
 /* Defines */
 
 /* uiBlock->dt */
-#define UI_EMBOSS              0       /* use one of the themes for drawing */
-#define UI_EMBOSSN             1       /* Nothing */
-#define UI_EMBOSSM             2       /* Minimal builtin emboss, also for logic buttons */
-#define UI_EMBOSSP             3       /* Pulldown */
-#define UI_EMBOSSR             4       /* Rounded */
-#define UI_EMBOSST             5       /* Table */
-
-#define UI_EMBOSSX             0       /* for a python file, which i can't change.... duh! */
+#define UI_EMBOSS              0       /* use widget style for drawing */
+#define UI_EMBOSSN             1       /* Nothing, only icon and/or text */
+#define UI_EMBOSSP             2       /* Pulldown menu style */
+#define UI_EMBOSST             3       /* Table */
 
 /* uiBlock->direction */
 #define UI_TOP         1
@@ -98,10 +94,6 @@ typedef struct uiPopupBlockHandle uiPopupBlockHandle;
 
        /* block->flag bits 12-15 are identical to but->flag bits */
 
-/* block->font, for now: bold = medium+1 */
-#define UI_HELV                        0
-#define UI_HELVB               1
-
 /* panel controls */
 #define UI_PNL_TRANSP  1
 #define UI_PNL_SOLID   2
@@ -282,12 +274,14 @@ void uiPupBlockO(struct bContext *C, uiBlockCreateFunc func, void *arg, char *op
  *
  * */
 
-uiBlock *uiBeginBlock(const struct bContext *C, struct ARegion *region, char *name, short dt, short font);
+uiBlock *uiBeginBlock(const struct bContext *C, struct ARegion *region, const char *name, short dt);
 void uiEndBlock(const struct bContext *C, uiBlock *block);
 void uiDrawBlock(const struct bContext *C, struct uiBlock *block);
 
 uiBlock *uiGetBlock(char *name, struct ARegion *ar);
 
+void uiBlockSetEmboss(uiBlock *block, short dt);
+
 void uiFreeBlock(const struct bContext *C, uiBlock *block);
 void uiFreeBlocks(const struct bContext *C, struct ListBase *lb);
 void uiFreeInactiveBlocks(const struct bContext *C, struct ListBase *lb);
@@ -305,10 +299,7 @@ void uiPopupBoundsBlock(uiBlock *block, int addval, int mx, int my);
 void uiMenuPopupBoundsBlock(uiBlock *block, int addvall, int mx, int my);
 
 int            uiBlocksGetYMin         (struct ListBase *lb);
-int            uiBlockGetCol           (uiBlock *block);
 
-void   uiBlockSetCol           (uiBlock *block, int col);
-void   uiBlockSetEmboss        (uiBlock *block, int emboss);
 void   uiBlockSetDirection     (uiBlock *block, int direction);
 void   uiBlockFlipOrder        (uiBlock *block);
 void   uiBlockSetFlag          (uiBlock *block, int flag);
@@ -320,8 +311,6 @@ int         uiButGetRetVal          (uiBut *but);
 void   uiButSetFlag            (uiBut *but, int flag);
 void   uiButClearFlag          (uiBut *but, int flag);
 
-void   uiAutoBlock(uiBlock *block, float minx, float miny, float sizex, float sizey, int flag);
-
 /* Buttons
  *
  * Functions to define various types of buttons in a block. Postfixes:
index 3ce658a..2dc0ab6 100644 (file)
@@ -392,68 +392,6 @@ void uiMenuPopupBoundsBlock(uiBlock *block, int addval, int mx, int my)
        block->my= my;
 }
 
-void ui_autofill(uiBlock *block)
-{
-       uiBut *but;
-       float *maxw, *maxh, startx = 0, starty, height = 0;
-       float totmaxh;
-       int rows=0, /*  cols=0, */ i, lasti;
-       
-       /* first count rows */
-       but= block->buttons.last;
-       rows= but->x1+1;
-
-       /* calculate max width / height for each row */
-       maxw= MEM_callocN(sizeof(float)*rows, "maxw");
-       maxh= MEM_callocN(sizeof(float)*rows, "maxh");
-       but= block->buttons.first;
-       while(but) {
-               i= but->x1;
-               if( maxh[i] < but->y2) maxh[i]= but->y2;
-               maxw[i] += but->x2;
-               but= but->next;
-       }
-       
-       totmaxh= 0.0;
-       for(i=0; i<rows; i++) totmaxh+= maxh[i];
-       
-       /* apply widths/heights */
-       starty= block->maxy;
-       but= block->buttons.first;
-       lasti= -1;
-       while(but) {
-               // signal for aligning code
-               but->flag |= UI_BUT_ALIGN_DOWN;
-               
-               i= but->x1;
-
-               if(i!=lasti) {
-                       startx= block->minx;
-                       height= (maxh[i]*(block->maxy-block->miny))/totmaxh;
-                       starty-= height;
-                       lasti= i;
-               }
-               
-               but->y1= starty+but->aspect;
-               but->y2= but->y1+height-but->aspect;
-               
-               but->x2= (but->x2*(block->maxx-block->minx))/maxw[i];
-               but->x1= startx+but->aspect;
-               
-               startx+= but->x2;
-               but->x2+= but->x1-but->aspect;
-               
-               ui_check_but(but);
-               
-               but= but->next;
-       }
-       
-       uiBlockEndAlign(block);
-       
-       MEM_freeN(maxw); MEM_freeN(maxh);       
-       block->autofill= 0;
-}
-
 /* ************** LINK LINE DRAWING  ************* */
 
 /* link line drawing is not part of buttons or theme.. so we stick with it here */
@@ -469,7 +407,7 @@ static void ui_draw_linkline(uiBut *but, uiLinkLine *line)
        vec2[0]= (line->to->x1+line->to->x2)/2.0;
        vec2[1]= (line->to->y1+line->to->y2)/2.0;
        
-       if(line->flag & UI_SELECT) UI_ThemeColorShade(but->themecol, 80);
+       if(line->flag & UI_SELECT) glColor3ub(100,100,100);
        else glColor3ub(0,0,0);
        fdrawline(vec1[0], vec1[1], vec2[0], vec2[1]);
 }
@@ -628,7 +566,6 @@ void uiEndBlock(const bContext *C, uiBlock *block)
        else if(block->dobounds == 2) ui_text_bounds_block(block, 0.0f);
        else if(block->dobounds) ui_popup_bounds_block(C, block, (block->dobounds == 4));
 
-       if(block->autofill) ui_autofill(block);
        if(block->minx==0.0 && block->maxx==0.0) uiBoundsBlock(block, 0);
        if(block->flag & UI_BUT_ALIGN) uiBlockEndAlign(block);
 
@@ -1788,7 +1725,7 @@ void uiFreeInactiveBlocks(const bContext *C, ListBase *lb)
        }
 }
 
-uiBlock *uiBeginBlock(const bContext *C, ARegion *region, char *name, short dt, short font)
+uiBlock *uiBeginBlock(const bContext *C, ARegion *region, const char *name, short dt)
 {
        ListBase *lb;
        uiBlock *block, *oldblock= NULL;
@@ -1814,6 +1751,7 @@ uiBlock *uiBeginBlock(const bContext *C, ARegion *region, char *name, short dt,
        block= MEM_callocN(sizeof(uiBlock), "uiBlock");
        block->oldblock= oldblock;
        block->active= 1;
+       block->dt= dt;
 
        /* at the beginning of the list! for dynamical menus/blocks */
        if(lb)
@@ -1821,9 +1759,6 @@ uiBlock *uiBeginBlock(const bContext *C, ARegion *region, char *name, short dt,
 
        BLI_strncpy(block->name, name, sizeof(block->name));
 
-       block->dt= dt;
-       block->themecol= TH_AUTO;
-
        /* window matrix and aspect */
        if(region->swinid) {
                wm_subwindow_getmatrix(window, region->swinid, block->winmat);
@@ -1860,6 +1795,11 @@ uiBlock *uiGetBlock(char *name, ARegion *ar)
        return NULL;
 }
 
+void uiBlockSetEmboss(uiBlock *block, short dt)
+{
+       block->dt= dt;
+}
+
 void ui_check_but(uiBut *but)
 {
        /* if something changed in the button */
@@ -2014,41 +1954,6 @@ void ui_check_but(uiBut *but)
        /* text clipping moved to widget drawing code itself */
 }
 
-static int ui_auto_themecol(uiBut *but)
-{
-       if(but->block->flag & UI_BLOCK_LOOP)
-               return TH_MENU_ITEM;
-
-       switch(but->type) {
-       case BUT:
-               return TH_BUT_ACTION;
-       case ROW:
-       case TOG:
-       case TOG3:
-       case TOGR:
-       case TOGN:
-       case BUT_TOGDUAL:
-               return TH_BUT_SETTING;
-       case SLI:
-       case NUM:
-       case NUMSLI:
-       case NUMABS:
-       case HSVSLI:
-               return TH_BUT_NUM;
-       case TEX:
-               return TH_BUT_TEXTFIELD;
-       case PULLDOWN:
-       case HMENU:
-       case BLOCK:
-       case MENU:
-       case BUTM:
-               return TH_BUT_POPUP;
-       case ROUNDBOX:
-               return TH_PANEL;
-       default:
-               return TH_BUT_NEUTRAL;
-       }
-}
 
 void uiBlockBeginAlign(uiBlock *block)
 {
@@ -2252,7 +2157,6 @@ static uiBut *ui_def_but(uiBlock *block, int type, int retval, char *str, short
        but->bit= type & BIT;
        but->bitnr= type & 31;
        but->icon = 0;
-       but->dt= block->dt;
 
        but->retval= retval;
        if( strlen(str)>=UI_MAX_NAME_STR-1 ) {
@@ -2265,14 +2169,9 @@ static uiBut *ui_def_but(uiBlock *block, int type, int retval, char *str, short
        }
        but->x1= x1; 
        but->y1= y1;
-       if(block->autofill) {
-               but->x2= x2; 
-               but->y2= y2;
-       }
-       else {
-               but->x2= (x1+x2); 
-               but->y2= (y1+y2);
-       }
+       but->x2= (x1+x2); 
+       but->y2= (y1+y2);
+       
        but->poin= poin;
        but->hardmin= but->softmin= min; 
        but->hardmax= but->softmax= max;
@@ -2280,18 +2179,13 @@ static uiBut *ui_def_but(uiBlock *block, int type, int retval, char *str, short
        but->a2= a2;
        but->tip= tip;
        
-       but->font= block->curfont;
-       
        but->lock= block->lock;
        but->lockstr= block->lockstr;
+       but->dt= block->dt;
 
        but->aspect= 1.0f; //XXX block->aspect;
-       but->win= block->win;
        but->block= block;              // pointer back, used for frontbuffer status, and picker
 
-       if(block->themecol==TH_AUTO) but->themecol= ui_auto_themecol(but);
-       else but->themecol= block->themecol;
-
        but->func= block->func;
        but->func_arg1= block->func_arg1;
        but->func_arg2= block->func_arg2;
@@ -2915,17 +2809,6 @@ uiBut *uiDefMenuTogR(uiBlock *block, PointerRNA *ptr, char *propname, char *prop
 
 /* END Button containing both string label and icon */
 
-void uiAutoBlock(uiBlock *block, float minx, float miny, float sizex, float sizey, int flag)
-{
-       block->minx= minx;
-       block->maxx= minx+sizex;
-       block->miny= miny;
-       block->maxy= miny+sizey;
-       
-       block->autofill= flag;  /* also check for if it has to be done */
-
-}
-
 void uiSetButLink(uiBut *but, void **poin, void ***ppoin, short *tot, int from, int to)
 {
        uiLink *link;
@@ -2953,18 +2836,6 @@ int uiBlocksGetYMin(ListBase *lb)
        return min;
 }
 
-int uiBlockGetCol(uiBlock *block)
-{
-       return block->themecol;
-}
-void uiBlockSetCol(uiBlock *block, int col)
-{
-       block->themecol= col;
-}
-void uiBlockSetEmboss(uiBlock *block, int emboss)
-{
-       block->dt= emboss;
-}
 void uiBlockSetDirection(uiBlock *block, int direction)
 {
        block->direction= direction;
@@ -3010,23 +2881,22 @@ void uiBlockSetFlag(uiBlock *block, int flag)
 {
        block->flag|= flag;
 }
+
 void uiBlockClearFlag(uiBlock *block, int flag)
 {
        block->flag&= ~flag;
 }
+
 void uiBlockSetXOfs(uiBlock *block, int xofs)
 {
        block->xofs= xofs;
 }
-void* uiBlockGetCurFont(uiBlock *block)
-{
-       return block->curfont;
-}
 
 void uiButSetFlag(uiBut *but, int flag)
 {
        but->flag|= flag;
 }
+
 void uiButClearFlag(uiBut *but, int flag)
 {
        but->flag&= ~flag;
index 8dba795..153db7a 100644 (file)
@@ -656,7 +656,7 @@ static void ui_draw_but_CHARTAB(uiBut *but)
        /* resets the font size */
        if(G.ui_international == TRUE)
        {
-               uiSetCurFont(but->block, UI_HELV);
+               // uiSetCurFont(but->block, UI_HELV);
        }
 }
 
@@ -1040,18 +1040,6 @@ void ui_draw_but_CURVE(ARegion *ar, uiBut *but, rcti *rect)
 }
 
 
-void ui_draw_roundbox(uiBut *but)
-{
-       glEnable(GL_BLEND);
-       
-       UI_ThemeColorShadeAlpha(but->themecol, but->a2, but->a2);
-
-       uiSetRoundBox(but->a1);
-       gl_round_box(GL_POLYGON, but->x1, but->y1, but->x2, but->y2, but->hardmin);
-
-       glDisable(GL_BLEND);
-}
-
 /* ****************************************************** */
 
 
index 776f365..eb32c29 100644 (file)
@@ -39,7 +39,6 @@ struct IDProperty;
 struct uiHandleButtonData;
 struct wmEvent;
 struct wmWindow;
-struct uiFontStyle;
 struct uiStyle;
 
 /* ****************** general defines ************** */
@@ -121,9 +120,6 @@ typedef struct {
        short xofs, yofs;
 } uiIconImage;
 
-typedef struct {
-       void *xl, *large, *medium, *small;
-} uiFontOld;
 
 typedef struct uiLinkLine {                            /* only for draw/edit */
        struct uiLinkLine *next, *prev;
@@ -177,9 +173,6 @@ struct uiBut {
        
        char *tip, *lockstr;
 
-       int themecol;   /* themecolor id */
-       void *font;
-
        BIFIconID icon;
        short but_align;        /* aligning buttons, horiz/vertical */
        short lock, win;
@@ -246,14 +239,10 @@ struct uiBlock {
        /* extra draw function for custom blocks */
        void (*drawextra)();
 
-       int themecol;   /* themecolor id */
-       
-       short font;     /* indices */
        int afterval, flag;
-       void *curfont;
        
-       short autofill, win, winq, direction, dt;
-       short auto_open, in_use, pad;
+       short direction, dt;
+       short auto_open, in_use;
        double auto_open_last;
 
        int lock;
@@ -269,7 +258,6 @@ struct uiBlock {
        uiPopupBlockHandle *handle;     // handle
        int tooltipdisabled;            // to avoid tooltip after click
 
-       int handler;                            // for panels in other windows than buttonswin... just event code
        int active;                                     // to keep blocks while drawing and free them afterwards
 };
 
@@ -305,7 +293,6 @@ extern int ui_get_but_string_max_length(uiBut *but);
 extern void ui_set_but_soft_range(uiBut *but, double value);
 
 extern void ui_check_but(uiBut *but);
-extern void ui_autofill(uiBlock *block);
 extern int  ui_is_but_float(uiBut *but);
 extern void ui_update_block_buts_hsv(uiBlock *block, float *hsv);
 
index e5e9706..786d819 100644 (file)
@@ -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)
index ea1ab05..261d36c 100644 (file)
@@ -212,7 +212,6 @@ int uiNewPanel(const bContext *C, ARegion *ar, uiBlock *block, char *panelname,
        }
 
        block->panel= pa;
-       block->handler= pnl_handler;
        pa->active= 1;
        pa->control= pnl_control;
        
@@ -299,7 +298,6 @@ static void ui_scale_panel_block(uiBlock *block)
        
        if(block->panel==NULL) return;
 
-       if(block->autofill) ui_autofill(block);
        /* buttons min/max centered, offset calculated */
        ui_bounds_block(block);
 
@@ -365,12 +363,10 @@ void uiPanelsHome(ARegion *ar)
 
                /* no panels, but old 'loose' buttons, as in old logic editor */
                for(block= ar->uiblocks.first; block; block= block->next) {
-                       //XXX 2.50 if(block->win==sa->win) {
-                               if(block->minx < v2d->tot.xmin) v2d->tot.xmin= block->minx;
-                               if(block->maxx > v2d->tot.xmax) v2d->tot.xmax= block->maxx; 
-                               if(block->miny < v2d->tot.ymin) v2d->tot.ymin= block->miny;
-                               if(block->maxy > v2d->tot.ymax) v2d->tot.ymax= block->maxy; 
-                       //XXX }
+                       if(block->minx < v2d->tot.xmin) v2d->tot.xmin= block->minx;
+                       if(block->maxx > v2d->tot.xmax) v2d->tot.xmax= block->maxx; 
+                       if(block->miny < v2d->tot.ymin) v2d->tot.ymin= block->miny;
+                       if(block->maxy > v2d->tot.ymax) v2d->tot.ymax= block->maxy; 
                }
        }
 }
@@ -408,12 +404,10 @@ static void ui_panels_update_totrct(ARegion *ar)
        if(done==0) {
                /* no panels, but old 'loose' buttons, as in old logic editor */
                for(block= ar->uiblocks.first; block; block= block->next) {
-                       //XXX 2.50 if(block->win==sa->win) {
-                               if(block->minx < v2d->tot.xmin) v2d->tot.xmin= block->minx;
-                               if(block->maxx > v2d->tot.xmax) v2d->tot.xmax= block->maxx; 
-                               if(block->miny < v2d->tot.ymin) v2d->tot.ymin= block->miny;
-                               if(block->maxy > v2d->tot.ymax) v2d->tot.ymax= block->maxy; 
-                       //XXX }
+                       if(block->minx < v2d->tot.xmin) v2d->tot.xmin= block->minx;
+                       if(block->maxx > v2d->tot.xmax) v2d->tot.xmax= block->maxx; 
+                       if(block->miny < v2d->tot.ymin) v2d->tot.ymin= block->miny;
+                       if(block->maxy > v2d->tot.ymax) v2d->tot.ymax= block->maxy; 
                }
        }       
 
@@ -1313,7 +1307,6 @@ static void ui_handle_panel_header(bContext *C, uiBlock *block, int mx, int my)
        
        if(button) {
                if(button==2) { // close
-                       //XXX 2.50 rem_blockhandler(sa, block->handler);
                        ED_region_tag_redraw(ar);
                }
                else {  // collapse
index 85091fc..b730cba 100644 (file)
@@ -324,7 +324,6 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but)
        /* create tooltip data */
        data= MEM_callocN(sizeof(uiTooltipData), "uiTooltipData");
        data->tip= BLI_strdup(but->tip);
-       data->font= but->font;
        data->aspect= but->aspect;
        
        /* set font, get bb */
@@ -738,10 +737,8 @@ uiBlock *ui_block_func_MENU(bContext *C, uiPopupBlockHandle *handle, void *arg_b
        int width, height, boxh, columns, rows, startx, starty, x1, y1, xmax, a;
 
        /* create the block */
-       block= uiBeginBlock(C, handle->region, "menu", UI_EMBOSSP, UI_HELV);
-       block->dt= UI_EMBOSSP;
+       block= uiBeginBlock(C, handle->region, "menu", UI_EMBOSSP);
        block->flag= UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_NUMSELECT;
-       block->themecol= TH_MENU_ITEM;
 
        /* compute menu data */
        md= decompose_menu_string(but->str);
@@ -848,9 +845,8 @@ uiBlock *ui_block_func_ICONROW(bContext *C, uiPopupBlockHandle *handle, void *ar
        uiBlock *block;
        int a;
        
-       block= uiBeginBlock(C, handle->region, "menu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, handle->region, "menu", UI_EMBOSSP);
        block->flag= UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_NUMSELECT;
-       block->themecol= TH_MENU_ITEM;
        
        for(a=(int)but->hardmin; a<=(int)but->hardmax; a++) {
                uiDefIconButF(block, BUTM|FLO, B_NOP, but->icon+(a-but->hardmin), 0, (short)(18*a), (short)(but->x2-but->x1-4), 18, &handle->retvalue, (float)a, 0.0, 0, 0, "");
@@ -870,9 +866,8 @@ uiBlock *ui_block_func_ICONTEXTROW(bContext *C, uiPopupBlockHandle *handle, void
        MenuData *md;
        int width, xmax, ypos, a;
 
-       block= uiBeginBlock(C, handle->region, "menu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, handle->region, "menu", UI_EMBOSSP);
        block->flag= UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_NUMSELECT;
-       block->themecol= TH_MENU_ITEM;
 
        md= decompose_menu_string(but->str);
 
@@ -1274,9 +1269,8 @@ uiBlock *ui_block_func_COL(bContext *C, uiPopupBlockHandle *handle, void *arg_bu
        static float hsvcol[3], oldcol[3];
        static char hexcol[128];
        
-       block= uiBeginBlock(C, handle->region, "colorpicker", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, handle->region, "colorpicker", UI_EMBOSS);
        block->flag= UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_KEEP_OPEN;
-       block->themecol= TH_BUT_NUM;
        
        VECCOPY(handle->retvec, but->editvec);
        uiBlockPickerButtons(block, handle->retvec, hsvcol, oldcol, hexcol, 'p', 0);
@@ -1342,9 +1336,8 @@ uiBlock *ui_block_func_PUPMENU(bContext *C, uiPopupBlockHandle *handle, void *ar
        height= 0;
 
        /* block stuff first, need to know the font */
-       block= uiBeginBlock(C, handle->region, "menu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, handle->region, "menu", UI_EMBOSSP);
        uiBlockSetFlag(block, UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_RET_1|UI_BLOCK_NUMSELECT);
-       block->themecol= TH_MENU_ITEM;
        block->direction= UI_DOWN;
        
        md= decompose_menu_string(info->instr);
@@ -1504,9 +1497,8 @@ uiBlock *ui_block_func_PUPMENUCOL(bContext *C, uiPopupBlockHandle *handle, void
        height= 0;
 
        /* block stuff first, need to know the font */
-       block= uiBeginBlock(C, handle->region, "menu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, handle->region, "menu", UI_EMBOSSP);
        uiBlockSetFlag(block, UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_RET_1|UI_BLOCK_NUMSELECT);
-       block->themecol= TH_MENU_ITEM;
        block->direction= UI_DOWN;
        
        md= decompose_menu_string(info->instr);
@@ -1765,9 +1757,8 @@ static uiBlock *ui_block_func_MENU_ITEM(bContext *C, uiPopupBlockHandle *handle,
        
        /* block stuff first, need to know the font */
        sprintf(str, "tb %d", counter++);
-       block= uiBeginBlock(C, handle->region, str, UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, handle->region, str, UI_EMBOSSP);
        uiBlockSetButmFunc(block, head->eventfunc, head->argv);
-       block->themecol= TH_MENU_ITEM;
        block->direction= UI_DOWN;
 
        width= 50; // fixed with, uiMenuPopupBoundsBlock will compute actual width
index d8d193d..d91dadf 100644 (file)
@@ -419,7 +419,7 @@ int uiDefIDPoinButs(uiBlock *block, Main *bmain, ID *parid, ID *id, int id_code,
        uiBut *but;
        uiIDPoinParams *params, *dup_params;
        char *str=NULL, str1[10];
-       int len, oldcol, add_addbutton=0;
+       int len, add_addbutton=0;
 
        /* setup struct that we will pass on with the buttons */
        params= MEM_callocN(sizeof(uiIDPoinParams), "uiIDPoinParams");
@@ -431,14 +431,15 @@ int uiDefIDPoinButs(uiBlock *block, Main *bmain, ID *parid, ID *id, int id_code,
 
        /* create buttons */
        uiBlockBeginAlign(block);
-       oldcol= uiBlockGetCol(block);
 
+       /* XXX solve?
        if(id && id->us>1)
                uiBlockSetCol(block, TH_BUT_SETTING1);
 
        if((events & UI_ID_PIN) && *pin_p)
                uiBlockSetCol(block, TH_BUT_SETTING2);
-
+       */
+       
        /* pin button */
        if(id && (events & UI_ID_PIN)) {
                but= uiDefIconButS(block, ICONTOG, (events & UI_ID_PIN), ICON_KEY_DEHLT, x, y ,DEF_ICON_BUT_WIDTH,DEF_BUT_HEIGHT, pin_p, 0, 0, 0, 0, "Keeps this view displaying the current data regardless of what object is selected");
@@ -488,22 +489,20 @@ int uiDefIDPoinButs(uiBlock *block, Main *bmain, ID *parid, ID *id, int id_code,
                MEM_freeN(str);
        }
 
-       uiBlockSetCol(block, oldcol);
-
        /* text button with name */
        if(id) {
-               /* name */
+               /* XXX solve?
                if(id->us > 1)
                        uiBlockSetCol(block, TH_BUT_SETTING1);
-
-               /* pinned data? */
+               */
+               /* pinned data? 
                if((events & UI_ID_PIN) && *pin_p)
                        uiBlockSetCol(block, TH_BUT_SETTING2);
-
-               /* redalert overrides pin color */
+               */
+               /* redalert overrides pin color 
                if(id->us<=0)
                        uiBlockSetCol(block, TH_REDALERT);
-
+               */
                uiBlockSetButLock(block, id->lib!=0, "Can't edit external libdata");
                
                /* name button */
@@ -592,7 +591,6 @@ int uiDefIDPoinButs(uiBlock *block, Main *bmain, ID *parid, ID *id, int id_code,
        }
        /* add new button */
        else if(add_addbutton) {
-               uiBlockSetCol(block, oldcol);
                if(parid) uiBlockSetButLock(block, parid->lib!=0, "Can't edit external libdata");
                dup_params= MEM_dupallocN(params);
                but= uiDefButS(block, TOG, 0, "Add New", x, y, 110, DEF_BUT_HEIGHT, &dup_params->browsenr, params->browsenr, 32767.0, 0, 0, "Add new data block");
@@ -600,7 +598,6 @@ int uiDefIDPoinButs(uiBlock *block, Main *bmain, ID *parid, ID *id, int id_code,
                x+= 110;
        }
        
-       uiBlockSetCol(block, oldcol);
        uiBlockEndAlign(block);
 
        MEM_freeN(params);
@@ -915,7 +912,7 @@ static uiBlock *curvemap_clipping_func(struct bContext *C, struct ARegion *ar, v
        uiBlock *block;
        uiBut *bt;
        
-       block= uiBeginBlock(C, ar, "curvemap_clipping_func", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "curvemap_clipping_func", UI_EMBOSS);
        
        /* use this for a fake extra empy space around the buttons */
        uiDefBut(block, LABEL, 0, "",                   -4, 16, 128, 106, NULL, 0, 0, 0, 0, "");
@@ -975,7 +972,7 @@ static uiBlock *curvemap_tools_func(struct bContext *C, struct ARegion *ar, void
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "curvemap_tools_func", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "curvemap_tools_func", UI_EMBOSS);
        uiBlockSetButmFunc(block, curvemap_tools_dofunc, cumap_v);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Reset View",                             0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 1, "");
index 58e4b12..3019aab 100644 (file)
@@ -114,7 +114,7 @@ void sel_verts_defgroup (Object *obedit, int select)
                if(select) EM_select_flush(em); // vertices to edges/faces
                else EM_deselect_flush(em);
 
-               BKE_mesh_end_editmesh(em, me);
+               BKE_mesh_end_editmesh(me, em);
        }
                break;
        case OB_LATTICE:
index 0e6feaf..e56c33d 100644 (file)
@@ -1114,6 +1114,7 @@ int hook_getIndexArray(Object *obedit, int *tot, int **indexar, char *name, floa
                        } else {
                                int ret = return_editmesh_vgroup(obedit, em, name, cent_r);
                                BKE_mesh_end_editmesh(me, em);
+                               return ret;
                        }
                }
                case OB_CURVE:
index 17e5155..492f133 100644 (file)
@@ -877,9 +877,6 @@ int ED_area_header_standardbuttons(const bContext *C, uiBlock *block, int yco)
        uiBut *but;
        int xco= 8;
        
-       if(ED_screen_area_active(C)) uiBlockSetCol(block, TH_HEADER);
-       else uiBlockSetCol(block, TH_HEADERDESEL);
-       
        but= uiDefIconTextButC(block, ICONTEXTROW, 0, ICON_VIEW3D, 
                                                   windowtype_pup(), xco, yco, XIC+10, YIC, 
                                                   &(sa->butspacetype), 1.0, SPACEICONMAX, 0, 0, 
index 4eb2630..e220882 100644 (file)
@@ -136,7 +136,7 @@ static void meshactionbuts(SpaceAction *saction, Object *ob, Key *key)
        myortho2(-0.375f, curarea->winx-0.375f, G.v2d->cur.ymin, G.v2d->cur.ymax);
        
     sprintf(str, "actionbuttonswin %d", curarea->win);
-    block= uiNewBlock (&curarea->uiblocks, str, UI_EMBOSS, UI_HELV, curarea->win);
+    block= uiNewBlock (&curarea->uiblocks, str, UI_EMBOSS);
 
        x = ACHANNEL_NAMEWIDTH + 1;
     y = 0.0f;
@@ -299,8 +299,7 @@ static void action_icu_buts(SpaceAction *saction)
        myortho2(-0.375f, curarea->winx-0.375f, G.v2d->cur.ymin, G.v2d->cur.ymax);
        
     sprintf(str, "actionbuttonswin %d", curarea->win);
-    block= uiNewBlock (&curarea->uiblocks, str, 
-                       UI_EMBOSS, UI_HELV, curarea->win);
+    block= uiNewBlock (&curarea->uiblocks, str, UI_EMBOSS);
 
        x = (float)ACHANNEL_NAMEWIDTH + 1;
     y = 0.0f;
index c7fafec..68dc9b2 100644 (file)
@@ -255,7 +255,7 @@ static uiBlock *action_keymenu_transformmenu(bContext *C, ARegion *ar, void *arg
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "action_keymenu_transformmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "action_keymenu_transformmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_keymenu_transformmenu, NULL);
 
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
@@ -303,7 +303,7 @@ static uiBlock *action_keymenu_snapmenu(bContext *C, ARegion *ar, void *arg_unus
        short yco= 0, menuwidth=120;
 
        
-       block= uiBeginBlock(C, ar, "action_keymenu_snapmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "action_keymenu_snapmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_keymenu_snapmenu, NULL);
 
        if (saction->flag & SACTION_DRAWTIME) {
@@ -365,7 +365,7 @@ static uiBlock *action_keymenu_mirrormenu(bContext *C, ARegion *ar, void *arg_un
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "action_keymenu_mirrormenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "action_keymenu_mirrormenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_keymenu_mirrormenu, NULL);
 
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
@@ -419,7 +419,7 @@ static uiBlock *action_keymenu_handlemenu(bContext *C, ARegion *ar, void *arg_un
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "action_keymenu_handlemenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "action_keymenu_handlemenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_keymenu_handlemenu, NULL);
 
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
@@ -471,7 +471,7 @@ static uiBlock *action_keymenu_extendmenu(bContext *C, ARegion *ar, void *arg_un
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "action_keymenu_extendmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "action_keymenu_extendmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_keymenu_extendmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
@@ -520,7 +520,7 @@ static uiBlock *action_keymenu_intpolmenu(bContext *C, ARegion *ar, void *arg_un
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "action_keymenu_intpolmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "action_keymenu_intpolmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_keymenu_intpolmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
@@ -581,7 +581,7 @@ static uiBlock *action_keymenu(bContext *C, ARegion *ar, void *arg_unused)
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "action_keymenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "action_keymenu", UI_EMBOSSP);
 
 
        uiBlockSetButmFunc(block, do_action_keymenu, NULL);
@@ -670,7 +670,7 @@ static uiBlock *action_framemenu(bContext *C, ARegion *ar, void *arg_unused)
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "action_framemenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "action_framemenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_action_keymenu, NULL);
        
        uiDefIconTextBlockBut(block, action_keymenu_transformmenu, 
@@ -754,7 +754,7 @@ static uiBlock *action_markermenu(bContext *C, ARegion *ar, void *arg_unused)
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "action_markermenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "action_markermenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_markermenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Add Marker|M", 0, yco-=20, 
@@ -825,7 +825,7 @@ static uiBlock *action_channelmenu_posmenu(bContext *C, ARegion *ar, void *arg_u
        uiBlock *block;
        short yco= 0, menuwidth=120;
 
-       block= uiBeginBlock(C, ar, "action_channelmenu_posmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "action_channelmenu_posmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_channelmenu_posmenu, NULL);
 
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
@@ -879,7 +879,7 @@ static uiBlock *action_channelmenu_groupmenu(bContext *C, ARegion *ar, void *arg
        uiBlock *block;
        short yco= 0, menuwidth=120;
 
-       block= uiBeginBlock(C, ar, "action_channelmenu_groupmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "action_channelmenu_groupmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_channelmenu_groupmenu, NULL);
 
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
@@ -923,7 +923,7 @@ static uiBlock *action_channelmenu_settingsmenu(bContext *C, ARegion *ar, void *
        uiBlock *block;
        short yco= 0, menuwidth=120;
 
-       block= uiBeginBlock(C, ar, "action_channelmenu_settingsmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "action_channelmenu_settingsmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_channelmenu_settingsmenu, NULL);
 
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
@@ -979,7 +979,7 @@ static uiBlock *action_channelmenu(bContext *C, ARegion *ar, void *arg_unused)
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "action_channelmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "action_channelmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_channelmenu, NULL);
                
        uiDefIconTextBlockBut(block, action_channelmenu_groupmenu, 
@@ -1043,7 +1043,7 @@ static uiBlock *action_gplayermenu(bContext *C, ARegion *ar, void *arg_unused)
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "action_gplayermenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "action_gplayermenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_channelmenu, NULL);
                
        uiDefIconTextBlockBut(block, action_channelmenu_settingsmenu, 
@@ -1097,7 +1097,7 @@ static uiBlock *action_selectmenu_columnmenu(bContext *C, ARegion *ar, void *arg
        uiBlock *block;
        short yco= 0, menuwidth=120;
 
-       block= uiBeginBlock(C, ar, "action_selectmenu_columnmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "action_selectmenu_columnmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_selectmenu_columnmenu, NULL);
 
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
@@ -1208,7 +1208,7 @@ static uiBlock *action_selectmenu(bContext *C, ARegion *ar, void *arg_unused)
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "action_selectmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "action_selectmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_selectmenu, NULL);
 
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
@@ -1382,7 +1382,7 @@ static uiBlock *action_viewmenu(bContext *C, ARegion *ar, void *arg_unused)
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "viewmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "viewmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_viewmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
@@ -1595,7 +1595,7 @@ void action_header_buttons(const bContext *C, ARegion *ar)
        uiBlock *block;
        int xco, yco= 3, xmax;
        
-       block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS);
        uiBlockSetHandleFunc(block, do_action_buttons, NULL);
        
        xco= ED_area_header_standardbuttons(C, block, yco);
index cc3dfa6..a09b732 100644 (file)
@@ -85,7 +85,7 @@ static uiBlock *dummy_viewmenu(bContext *C, ARegion *ar, void *arg_unused)
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "dummy_viewmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "dummy_viewmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_viewmenu, NULL);
        
        if (sbuts->align == 1) uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "Horizontal", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
@@ -135,7 +135,7 @@ void buttons_header_buttons(const bContext *C, ARegion *ar)
        uiBlock *block;
        int xco, yco= 3;
        
-       block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS);
        uiBlockSetHandleFunc(block, do_buttons_buttons, NULL);
        
        xco= ED_area_header_standardbuttons(C, block, yco);
index 3d1be59..d0a78e7 100644 (file)
@@ -68,7 +68,7 @@ static void render_panel_output(const bContext *C, ARegion *ar)
        int a,b;
        //char *strp;
 
-       block= uiBeginBlock(C, ar, "render_panel_output", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "render_panel_output", UI_EMBOSS);
        if(uiNewPanel(C, ar, block, "Output", "Render", 0, 0, 318, 204)==0) return;
        
        uiBlockBeginAlign(block);
@@ -115,8 +115,6 @@ static void render_panel_output(const bContext *C, ARegion *ar)
        }
        uiBlockEndAlign(block);
        
-       uiBlockSetCol(block, TH_AUTO);
-               
        uiBlockBeginAlign(block);
        for(b=2; b>=0; b--)
                for(a=0; a<3; a++)
@@ -164,7 +162,7 @@ static void render_panel_bake(const bContext *C, ARegion *ar)
        Scene *scene= CTX_data_scene(C);
        uiBut *but;
        
-       block= uiBeginBlock(C, ar, "render_panel_bake", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "render_panel_bake", UI_EMBOSS);
        uiNewPanelTabbed("Anim", "Render");
        if(uiNewPanel(C, ar, block, "Bake", "Render", 320, 0, 318, 204)==0) return;
        
@@ -324,7 +322,7 @@ static void render_panel_render(const bContext *C, Panel *pnl)
 
 
 #if 0
-       block= uiBeginBlock(C, ar, "render_panel_render", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "render_panel_render", UI_EMBOSS);
        if(uiNewPanel(C, ar, block, "Render", "Render", 320, 0, 318, 204)==0) return;
 
        uiBlockBeginAlign(block);
@@ -405,19 +403,17 @@ void render_panel_anim(const bContext *C, ARegion *ar)
        uiBlock *block;
        uiBut *but;
        
-       block= uiBeginBlock(C, ar,  "render_panel_anim", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar,  "render_panel_anim", UI_EMBOSS);
        if(uiNewPanel(C, ar, block, "Anim", "Render", 640, 0, 318, 204) == 0) return;
 
        but= uiDefButO(block, BUT, "SCREEN_OT_render", WM_OP_INVOKE_DEFAULT, "ANIM",  692,142,192,47, "Render the animation to disk from start to end frame, (Ctrl+F12)");
        RNA_boolean_set(uiButGetOperatorPtrRNA(but), "anim", 1);
        
-       uiBlockSetCol(block, TH_BUT_SETTING1);
        uiBlockBeginAlign(block);
        uiDefButBitI(block, TOG, R_DOSEQ, 0, "Do Sequence",692,114,192,20, &scene->r.scemode, 0, 0, 0, 0, "Enables sequence output rendering (Default: 3D rendering)");
        uiDefButBitI(block, TOG, R_DOCOMP, 0, "Do Composite",692,90,192,20, &scene->r.scemode, 0, 0, 0, 0, "Uses compositing nodes for output rendering");
        uiBlockEndAlign(block);
 
-       uiBlockSetCol(block, TH_AUTO);
        uiDefBut(block, BUT, 0, "PLAY",692,50,94,33, 0, 0, 0, 0, 0, "Play rendered images/avi animation (Ctrl+F11), (Play Hotkeys: A-Noskip, P-PingPong)");
        uiDefButS(block, NUM, 0, "rt:",789,50,95,33, &G.rt, -1000.0, 1000.0, 0, 0, "General testing/debug button");
 
index 2800934..5588343 100644 (file)
@@ -189,9 +189,6 @@ static void buttons_main_area_draw(const bContext *C, ARegion *ar)
                glColor3f(fac, fac, fac);
                glRecti(20, v2d->cur.ymin+2,  30, v2d->cur.ymin+12);
                
-               /* panels */
-               drawnewstuff();
-               
                /* reset view matrix */
                UI_view2d_view_restore(C);
                
index d54d3ce..6184425 100644 (file)
@@ -126,7 +126,7 @@ void file_draw_buttons(const bContext *C, ARegion *ar)
 
        /* HEADER */
        sprintf(name, "win %p", ar);
-       block = uiBeginBlock(C, ar, name, UI_EMBOSS, UI_HELV);
+       block = uiBeginBlock(C, ar, name, UI_EMBOSS);
        uiBlockSetHandleFunc(block, do_file_buttons, NULL);
 
        /* XXXX
index 7de6205..ddb890e 100644 (file)
@@ -101,7 +101,7 @@ void file_header_buttons(const bContext *C, ARegion *ar)
        int xco, yco= 3;
        int xcotitle;
        
-       block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS);
        uiBlockSetHandleFunc(block, do_file_header_buttons, NULL);
        
        xco= ED_area_header_standardbuttons(C, block, yco);
@@ -119,9 +119,6 @@ void file_header_buttons(const bContext *C, ARegion *ar)
        }
         */
        
-       /* SORT TYPE */
-       uiBlockSetEmboss(block, UI_EMBOSSX);
-       
        xco += 5;
 
        uiBlockBeginAlign(block);
index 3d845ac..28a83c4 100644 (file)
@@ -318,6 +318,8 @@ void FILE_OT_select_all_toggle(wmOperatorType *ot)
 
 /* ---------- BOOKMARKS ----------- */
 
+#define MARK_HEIGHT    22
+
 static void set_active_bookmark(FileSelectParams* params, struct ARegion* ar, short x, short y)
 {
        int nentries = fsmenu_get_nentries(fsmenu_get(), FS_CATEGORY_BOOKMARKS);
@@ -327,9 +329,9 @@ static void set_active_bookmark(FileSelectParams* params, struct ARegion* ar, sh
        UI_view2d_region_to_view(&ar->v2d, x, y, &fx, &fy);
 
        posy = ar->v2d.cur.ymax - 2*TILE_BORDER_Y - fy;
-       posy -= U.fontsize*2.0f;        /* header */
+       posy -= MARK_HEIGHT;    /* header */
        
-       params->active_bookmark = ((float)posy / (U.fontsize*2.0f));
+       params->active_bookmark = ((float)posy / (MARK_HEIGHT));
        if (params->active_bookmark < 0 || params->active_bookmark > nentries) {
                params->active_bookmark = -1;
        }
@@ -339,7 +341,7 @@ static int file_select_bookmark_category(SpaceFile* sfile, ARegion* ar, short x,
 {
        struct FSMenu* fsmenu = fsmenu_get();
        int nentries = fsmenu_get_nentries(fsmenu, category);
-       int linestep = U.fontsize*2.0f;
+       int linestep = MARK_HEIGHT;
        short xs, ys;
        int i;
        int selected = -1;
index a422bda..126ef69 100644 (file)
@@ -186,7 +186,7 @@ void ED_fileselect_init_layout(struct SpaceFile *sfile, struct ARegion *ar)
                sfile->layout->prv_border_x = 6;
                sfile->layout->prv_border_y = 6;
                sfile->layout->tile_w = sfile->layout->prv_w + 2*sfile->layout->prv_border_x;
-               sfile->layout->tile_h = sfile->layout->prv_h + 2*sfile->layout->prv_border_y + U.fontsize;
+               sfile->layout->tile_h = sfile->layout->prv_h + 2*sfile->layout->prv_border_y + 12; // XXX 12 = font h
                sfile->layout->width= (v2d->cur.xmax - v2d->cur.xmin - 2*sfile->layout->tile_border_x);
                sfile->layout->columns= sfile->layout->width / (sfile->layout->tile_w + 2*sfile->layout->tile_border_x);
                if(sfile->layout->columns > 0)
@@ -204,7 +204,7 @@ void ED_fileselect_init_layout(struct SpaceFile *sfile, struct ARegion *ar)
                sfile->layout->tile_border_y = 2;
                sfile->layout->prv_border_x = 0;
                sfile->layout->prv_border_y = 0;
-               sfile->layout->tile_h = U.fontsize*3/2;
+               sfile->layout->tile_h = 12*3/2; // XXX 12 = font h
                sfile->layout->height= v2d->cur.ymax - v2d->cur.ymin;
                sfile->layout->rows = sfile->layout->height / (sfile->layout->tile_h + 2*sfile->layout->tile_border_y);;
         
index 680273a..a54147f 100644 (file)
@@ -105,7 +105,7 @@ static void graph_panel_properties(const bContext *C, ARegion *ar, short cntrl,
        uiBlock *block;
        char name[128];
 
-       block= uiBeginBlock(C, ar, "graph_panel_properties", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "graph_panel_properties", UI_EMBOSS);
        if (uiNewPanel(C, ar, block, "Properties", "Graph", 340, 30, 318, 254)==0) return;
        uiBlockSetHandleFunc(block, do_graph_region_buttons, NULL);
 
@@ -201,7 +201,7 @@ static void graph_panel_drivers(const bContext *C, ARegion *ar, short cntrl, bAn
        uiBlock *block;
        uiBut *but;
 
-       block= uiBeginBlock(C, ar, "graph_panel_drivers", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "graph_panel_drivers", UI_EMBOSS);
        if (uiNewPanel(C, ar, block, "Drivers", "Graph", 340, 30, 318, 254)==0) return;
        uiBlockSetHandleFunc(block, do_graph_region_driver_buttons, NULL);
 
@@ -870,7 +870,7 @@ static void graph_panel_modifiers(const bContext *C, ARegion *ar, short cntrl, b
        uiBlock *block;
        int yco= 190;
        
-       block= uiBeginBlock(C, ar, "graph_panel_modifiers", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "graph_panel_modifiers", UI_EMBOSS);
        if (uiNewPanel(C, ar, block, "Modifiers", "Graph", 340, 30, 318, 254)==0) return;
        uiBlockSetHandleFunc(block, do_graph_region_modifier_buttons, NULL);
        
index ee4b5d5..c20278d 100644 (file)
@@ -97,7 +97,7 @@ static uiBlock *graph_viewmenu(bContext *C, ARegion *ar, void *arg_unused)
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "graph_viewmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "graph_viewmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_viewmenu, NULL);
        
                // XXX these options should use new menu-options
@@ -154,7 +154,7 @@ void graph_header_buttons(const bContext *C, ARegion *ar)
        uiBlock *block;
        int xco, yco= 3;
        
-       block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS);
        uiBlockSetHandleFunc(block, do_graph_buttons, NULL);
        
        xco= ED_area_header_standardbuttons(C, block, yco);
index a243d95..74397e7 100644 (file)
@@ -301,7 +301,7 @@ static void image_uvs_scriptsmenu (void *args_unused)
        int i= 0;
        short yco = 20, menuwidth = 120;
        
-       block= uiNewBlock(&curarea->uiblocks, "image_uvs_scriptsmenu", UI_EMBOSSP, UI_HELV, G.curscreen->mainwin);
+       block= uiNewBlock(&curarea->uiblocks, "image_uvs_scriptsmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_image_uvs_scriptsmenu, NULL);
        
        /* note that we acount for the N previous entries with i+20: */
@@ -731,7 +731,7 @@ void image_header_buttons(const bContext *C, ARegion *ar)
        RNA_id_pointer_create(&scene->id, &sceneptr);
        
        /* create block */
-       block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS);
        uiBlockSetHandleFunc(block, do_image_buttons, NULL);
        
        xco= ED_area_header_standardbuttons(C, block, yco);
index 6214429..2fe7f39 100644 (file)
@@ -388,7 +388,7 @@ static void image_panel_game_properties(const bContext *C, ARegion *ar)
        ImBuf *ibuf= BKE_image_get_ibuf(sima->image, &sima->iuser);
        uiBlock *block;
 
-       block= uiBeginBlock(C, ar, "image_panel_game_properties", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "image_panel_game_properties", UI_EMBOSS);
        if(uiNewPanel(C, ar, block, "Real-time Properties", "Image", 10, 10, 318, 204)==0)
                return;
        uiBlockSetHandleFunc(block, do_image_panel_events, NULL);
@@ -425,7 +425,7 @@ static void image_panel_view_properties(const bContext *C, ARegion *ar)
        Object *obedit= CTX_data_edit_object(C);
        uiBlock *block;
 
-       block= uiBeginBlock(C, ar, "image_view_properties", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "image_view_properties", UI_EMBOSS);
        if(uiNewPanel(C, ar, block, "View Properties", "Image", 10, 30, 318, 204)==0)
                return;
        uiBlockSetHandleFunc(block, do_image_panel_events, NULL);
@@ -507,10 +507,8 @@ void brush_buttons(const bContext *C, uiBlock *block, short fromsima,
        uiBlockEndAlign(block);
        yco -= 30;
        
-       uiBlockSetCol(block, TH_BUT_SETTING2);
        id= (ID*)settings->imapaint.brush;
        xco= 200; // std_libbuttons(block, 0, yco, 0, NULL, evt_browse, ID_BR, 0, id, NULL, menupoin, 0, evt_local, evt_del, 0, evt_keepdata);
-       uiBlockSetCol(block, TH_AUTO);
        
        if(brush && !brush->id.lib) {
                
@@ -569,9 +567,7 @@ void brush_buttons(const bContext *C, uiBlock *block, short fromsima,
                
                if(fromsima && settings->imapaint.tool == PAINT_TOOL_CLONE) {
                        id= (ID*)brush->clone.image;
-                       uiBlockSetCol(block, TH_BUT_SETTING2);
                        xco= 200; // std_libbuttons(block, 0, yco, 0, NULL, B_SIMACLONEBROWSE, ID_IM, 0, id, 0, menupoin, 0, 0, B_SIMACLONEDELETE, 0, 0);
-                       uiBlockSetCol(block, TH_AUTO);
                        if(id) {
                                butw= 320-(xco+5);
                                uiDefButF(block, NUMSLI, evt_change, "B ",xco+5,yco,butw,19, &brush->clone.alpha , 0.0, 1.0, 0, 0, "Opacity of clone image display");
@@ -589,11 +585,9 @@ void brush_buttons(const bContext *C, uiBlock *block, short fromsima,
                        else {
                                MTex *mtex= brush->mtex[brush->texact];
                                
-                               uiBlockSetCol(block, TH_BUT_SETTING2);
                                id= (mtex)? (ID*)mtex->tex: NULL;
                                xco= 200; // std_libbuttons(block, 0, yco, 0, NULL, evt_texbrowse, ID_TE, 0, id, NULL, menupoin, 0, 0, evt_texdel, 0, 0);
                                /*uiDefButBitS(block, TOG|BIT, BRUSH_FIXED_TEX, evt_change, "Fixed",    xco+5,yco,butw,19, &brush->flag, 0, 0, 0, 0, "Keep texture origin in fixed position");*/
-                               uiBlockSetCol(block, TH_AUTO);
                        }
                }
        }
@@ -613,7 +607,7 @@ static void image_panel_paintcolor(const bContext *C, ARegion *ar)
        static float hsv[3], old[3];    // used as temp mem for picker
        static char hexcol[128];
        
-       block= uiBeginBlock(C, ar, "image_panel_paintcolor", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "image_panel_paintcolor", UI_EMBOSS);
        uiBlockSetHandleFunc(block, do_image_panel_events, NULL);
        if(uiNewPanel(C, ar, block, "Paint Color", "Image", 10, 22, 318, 204)==0)
                return;
@@ -634,7 +628,7 @@ static void image_panel_paint(const bContext *C, ARegion *ar)
        SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
        uiBlock *block;
        
-       block= uiBeginBlock(C, ar, "image_panel_paint", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "image_panel_paint", UI_EMBOSS);
        uiBlockSetHandleFunc(block, do_image_panel_events, NULL);
        if(uiNewPanel(C, ar, block, "Image Paint", "Image", 10, 20, 318, 204)==0)
                return;
@@ -678,7 +672,7 @@ static void image_panel_curves(const bContext *C, ARegion *ar)
        /* and we check for spare */
        ibuf= ED_space_image_buffer(sima);
        
-       block= uiBeginBlock(C, ar, "image_panel_curves", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "image_panel_curves", UI_EMBOSS);
        if(uiNewPanel(C, ar, block, "Curves", "Image", 10, 40, 318, 204)==0)
                return;
        uiBlockSetHandleFunc(block, do_image_panel_events, NULL);
@@ -833,7 +827,7 @@ static void image_panel_preview(ScrArea *sa, short cntrl)   // IMAGE_HANDLER_PREVI
                return;
        }
        
-       block= uiBeginBlock(C, ar, "image_panel_preview", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "image_panel_preview", UI_EMBOSS);
        uiPanelControl(UI_PNL_SOLID | UI_PNL_CLOSE | UI_PNL_SCALE | cntrl);
        uiSetPanelHandler(IMAGE_HANDLER_PREVIEW);  // for close and esc
        
@@ -852,7 +846,7 @@ static void image_panel_gpencil(short cntrl)        // IMAGE_HANDLER_GREASEPENCIL
        
        sima= curarea->spacedata.first;
 
-       block= uiBeginBlock(C, ar, "image_panel_gpencil", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "image_panel_gpencil", UI_EMBOSS);
        uiPanelControl(UI_PNL_SOLID | UI_PNL_CLOSE  | cntrl);
        uiSetPanelHandler(IMAGE_HANDLER_GREASEPENCIL);  // for close and esc
        if (uiNewPanel(C, ar, block, "Grease Pencil", "SpaceImage", 100, 30, 318, 204)==0) return;
@@ -1408,7 +1402,7 @@ static void image_panel_properties(const bContext *C, ARegion *ar)
        SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
        uiBlock *block;
        
-       block= uiBeginBlock(C, ar, "image_panel_properties", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "image_panel_properties", UI_EMBOSS);
        if(uiNewPanel(C, ar, block, "Image Properties", "Image", 10, 50, 318, 204)==0)
                return;
        uiBlockSetHandleFunc(block, do_image_panel_events, NULL);
index 8efc51e..2adcd0c 100644 (file)
@@ -85,7 +85,7 @@ static uiBlock *dummy_viewmenu(bContext *C, ARegion *ar, void *arg_unused)
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "dummy_viewmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "dummy_viewmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_viewmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Nothing yet", 0, yco-=20, 
@@ -238,7 +238,7 @@ uiBlock *info_externalfiles(bContext *C, ARegion *ar, void *arg_unused)
        uiBlock *block;
        short yco = 20, menuwidth = 120;
        
-       block= uiBeginBlock(C, ar, "info_externalfiles", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "info_externalfiles", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_info_externalfiles, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Pack into .blend file",                          0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 1, "");
@@ -392,7 +392,7 @@ void info_header_buttons(const bContext *C, ARegion *ar)
        uiBlock *block;
        int xco, yco= 3;
        
-       block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS);
        uiBlockSetHandleFunc(block, do_info_buttons, NULL);
        
        xco= ED_area_header_standardbuttons(C, block, yco);
index cee940c..484f466 100644 (file)
@@ -71,7 +71,7 @@ static uiBlock *dummy_viewmenu(bContext *C, ARegion *ar, void *arg_unused)
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "dummy_viewmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "dummy_viewmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_viewmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Nothing yet", 0, yco-=20, 
@@ -104,7 +104,7 @@ void nla_header_buttons(const bContext *C, ARegion *ar)
        uiBlock *block;
        int xco, yco= 3;
        
-       block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS);
        uiBlockSetHandleFunc(block, do_nla_buttons, NULL);
        
        xco= ED_area_header_standardbuttons(C, block, yco);
index faf6fa8..2569300 100644 (file)
@@ -95,8 +95,6 @@
 
 #include "node_intern.h"
 
-extern void autocomplete_uv(char *str, void *arg_v);
-// XXX extern int verify_valid_uv_name(char *str);
 
 /* autocomplete callback for buttons */
 static void autocomplete_vcol(bContext *C, char *str, void *arg_v)
@@ -572,9 +570,11 @@ static int node_shader_buts_material(uiBlock *block, bNodeTree *ntree, bNode *no
                if(butr->ymax-butr->ymin > 21.0f) dy+= 19;
                
                uiBlockBeginAlign(block);
+               /* XXX
                if(node->id==NULL) uiBlockSetCol(block, TH_REDALERT);
                else if(has_us) uiBlockSetCol(block, TH_BUT_SETTING1);
                else uiBlockSetCol(block, TH_BUT_SETTING2);
+               */
                
                /* browse button */
                IDnames_to_pupstring(&strp, NULL, "ADD NEW %x32767", &(G.main->mat), NULL, NULL);
@@ -591,7 +591,6 @@ static int node_shader_buts_material(uiBlock *block, bNodeTree *ntree, bNode *no
                                                 butr->xmin+19, dy, (short)(butr->xmax-butr->xmin-19.0f), 19, 
                                                 NULL, 0.0, 0.0, 0, 0, "Add new Material");
                        uiButSetFunc(bt, node_new_mat_cb, ntree, node);
-                       uiBlockSetCol(block, TH_AUTO);
                }
                else {
                        /* name button */
@@ -614,7 +613,6 @@ static int node_shader_buts_material(uiBlock *block, bNodeTree *ntree, bNode *no
                        /* WATCH IT: we use this callback in material buttons, but then only want first row */
                        if(butr->ymax-butr->ymin > 21.0f) {
                                /* node options */
-                               uiBlockSetCol(block, TH_AUTO);
                                uiDefButBitS(block, TOG, SH_NODE_MAT_DIFF, B_NODE_EXEC, "Diff",
                                                         butr->xmin, butr->ymin, dx, 19, 
                                                         &node->custom1, 0, 0, 0, 0, "Material Node outputs Diffuse");
@@ -700,14 +698,12 @@ static int node_shader_buts_geometry(uiBlock *block, bNodeTree *ntree, bNode *no
                // XXX if(!verify_valid_uv_name(ngeo->uvname))
                // XXX  uiBlockSetCol(block, TH_REDALERT);
                but= uiDefBut(block, TEX, B_NODE_EXEC, "UV:", butr->xmin, butr->ymin+20, butr->xmax-butr->xmin, 20, ngeo->uvname, 0, 31, 0, 0, "Set name of UV layer to use, default is active UV layer");
-               // uiButSetCompleteFunc(but, autocomplete_uv, NULL);
-               uiBlockSetCol(block, TH_AUTO);
+               // XXX uiButSetCompleteFunc(but, autocomplete_uv, NULL);
 
-               if(!verify_valid_vcol_name(ngeo->colname))
-                       uiBlockSetCol(block, TH_REDALERT);
+               if(!verify_valid_vcol_name(ngeo->colname));
+//                     uiBlockSetCol(block, TH_REDALERT);
                but= uiDefBut(block, TEX, B_NODE_EXEC, "Col:", butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20, ngeo->colname, 0, 31, 0, 0, "Set name of vertex color layer to use, default is active vertex color layer");
                uiButSetCompleteFunc(but, autocomplete_vcol, NULL);
-               uiBlockSetCol(block, TH_AUTO);
        }
 
        return 40;
@@ -895,7 +891,6 @@ static int node_composit_buts_image(uiBlock *block, bNodeTree *ntree, bNode *nod
                char *strp;
                
                uiBlockBeginAlign(block);
-               uiBlockSetCol(block, TH_BUT_SETTING2);
                
                /* browse button */
                IMAnames_to_pupstring(&strp, NULL, "LOAD NEW %x32767", &(G.main->image), NULL, NULL);
@@ -912,7 +907,6 @@ static int node_composit_buts_image(uiBlock *block, bNodeTree *ntree, bNode *nod
                                                 butr->xmin+19, dy, (short)(butr->xmax-butr->xmin-19.0f), 19, 
                                                 NULL, 0.0, 0.0, 0, 0, "Add new Image");
                        uiButSetFunc(bt, node_active_cb, ntree, node);
-                       uiBlockSetCol(block, TH_AUTO);
                }
                else {
                        /* name button + type */
@@ -2266,7 +2260,6 @@ static int node_texture_buts_image(uiBlock *block, bNodeTree *ntree, bNode *node
        
        if( block ) {
                uiBlockBeginAlign(block);
-               uiBlockSetCol(block, TH_BUT_SETTING2);
                
                /* browse button */
                IMAnames_to_pupstring(&strp, NULL, "LOAD NEW %x32767", &(G.main->image), NULL, NULL);
@@ -2283,7 +2276,6 @@ static int node_texture_buts_image(uiBlock *block, bNodeTree *ntree, bNode *node
                                                 butr->xmin+19, butr->ymin, (short)(butr->xmax-butr->xmin-19.0f), 19, 
                                                 NULL, 0.0, 0.0, 0, 0, "Add new Image");
                        uiButSetFunc(bt, node_active_cb, ntree, node);
-                       uiBlockSetCol(block, TH_AUTO);
                }
                else {
                        /* name button */
index f914dc6..5d8e3f0 100644 (file)
@@ -517,7 +517,7 @@ static uiBlock *socket_vector_menu(bContext *C, ARegion *ar, void *socket_v)
                        break;
        }
        
-       block= uiBeginBlock(C, ar, "socket menu", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "socket menu", UI_EMBOSS);
 
        /* use this for a fake extra empy space around the buttons */
        uiDefBut(block, LABEL, 0, "",                   -4, -4, 188, 68, NULL, 0, 0, 0, 0, "");
@@ -768,8 +768,8 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN
                        /* make unique block name, also used for handling blocks in editnode.c */
                        sprintf(str, "node buttons %p", node);
                        
-                       //block= uiNewBlock(&sa->uiblocks, str, UI_EMBOSS, UI_HELV, sa->win);
-                       block= uiBeginBlock(C, ar, str, UI_EMBOSS, UI_HELV);
+                       //block= uiNewBlock(&sa->uiblocks, str, UI_EMBOSS);
+                       block= uiBeginBlock(C, ar, str, UI_EMBOSS);
                        uiBlockSetHandleFunc(block, do_node_internal_buttons, node);
                        // XXX if(snode->id)
                        // XXX  uiSetButLock(snode->id->lib!=NULL, ERROR_LIBDATA_MESSAGE);
index 14545b8..1192eb2 100644 (file)
@@ -97,8 +97,7 @@ static uiBlock *node_selectmenu(bContext *C, ARegion *ar, void *arg_unused)
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "node_selectmenu", 
-                                         UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "node_selectmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_node_selectmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Border Select|B", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
@@ -213,7 +212,7 @@ static uiBlock *node_add_inputmenu(bContext *C, ARegion *ar, void *arg_unused)
 {
        uiBlock *block;
 
-       block= uiBeginBlock(C, ar, "node_add_inputmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "node_add_inputmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_node_addmenu, NULL);
        
        node_make_addmenu(C, NODE_CLASS_INPUT, block);
@@ -228,7 +227,7 @@ static uiBlock *node_add_outputmenu(bContext *C, ARegion *ar, void *arg_unused)
 {
        uiBlock *block;
        
-       block= uiBeginBlock(C, ar, "node_add_outputmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "node_add_outputmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_node_addmenu, NULL);
        
        node_make_addmenu(C, NODE_CLASS_OUTPUT, block);
@@ -243,7 +242,7 @@ static uiBlock *node_add_colormenu(bContext *C, ARegion *ar, void *arg_unused)
 {
        uiBlock *block;
        
-       block= uiBeginBlock(C, ar, "node_add_colormenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "node_add_colormenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_node_addmenu, NULL);
        
        node_make_addmenu(C, NODE_CLASS_OP_COLOR, block);
@@ -258,7 +257,7 @@ static uiBlock *node_add_vectormenu(bContext *C, ARegion *ar, void *arg_unused)
 {
        uiBlock *block;
        
-       block= uiBeginBlock(C, ar, "node_add_vectormenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "node_add_vectormenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_node_addmenu, NULL);
        
        node_make_addmenu(C, NODE_CLASS_OP_VECTOR, block);
@@ -273,7 +272,7 @@ static uiBlock *node_add_filtermenu(bContext *C, ARegion *ar, void *arg_unused)
 {
        uiBlock *block;
        
-       block= uiBeginBlock(C, ar, "node_add_filtermenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "node_add_filtermenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_node_addmenu, NULL);
        
        node_make_addmenu(C, NODE_CLASS_OP_FILTER, block);
@@ -288,7 +287,7 @@ static uiBlock *node_add_convertermenu(bContext *C, ARegion *ar, void *arg_unuse
 {
        uiBlock *block;
        
-       block= uiBeginBlock(C, ar, "node_add_convertermenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "node_add_convertermenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_node_addmenu, NULL);
        
        node_make_addmenu(C, NODE_CLASS_CONVERTOR, block);
@@ -303,7 +302,7 @@ static uiBlock *node_add_mattemenu(bContext *C, ARegion *ar, void *arg_unused)
 {
        uiBlock *block;
        
-       block= uiBeginBlock(C, ar, "node_add_mattemenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "node_add_mattemenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_node_addmenu, NULL);
        
        node_make_addmenu(C, NODE_CLASS_MATTE, block);
@@ -318,7 +317,7 @@ static uiBlock *node_add_distortmenu(bContext *C, ARegion *ar, void *arg_unused)
 {
        uiBlock *block;
        
-       block= uiBeginBlock(C, ar, "node_add_distortmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "node_add_distortmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_node_addmenu, NULL);
        
        node_make_addmenu(C, NODE_CLASS_DISTORT, block);
@@ -333,7 +332,7 @@ static uiBlock *node_add_patternmenu(bContext *C, ARegion *ar,  void *arg_unused
 {
        uiBlock *block;
        
-       block= uiBeginBlock(C, ar, "node_add_patternmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "node_add_patternmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_node_addmenu, NULL);
        
        node_make_addmenu(C, NODE_CLASS_PATTERN, block);
@@ -348,7 +347,7 @@ static uiBlock *node_add_texturemenu(bContext *C, ARegion *ar, void *arg_unused)
 {
        uiBlock *block;
        
-       block= uiBeginBlock(C, ar, "node_add_texturemenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "node_add_texturemenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_node_addmenu, NULL);
        
        node_make_addmenu(C, NODE_CLASS_TEXTURE, block);
@@ -363,7 +362,7 @@ static uiBlock *node_add_groupmenu(bContext *C, ARegion *ar, void *arg_unused)
 {
        uiBlock *block;
        
-       block= uiBeginBlock(C, ar, "node_add_groupmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "node_add_groupmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_node_addmenu, NULL);
        
        node_make_addmenu(C, NODE_CLASS_GROUP, block);
@@ -379,7 +378,7 @@ static uiBlock *node_add_dynamicmenu(bContext *C, ARegion *ar, void *arg_unused)
 {
        uiBlock *block;
        
-       block= uiBeginBlock(C, ar, "node_add_dynamicmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "node_add_dynamicmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_node_addmenu, NULL);
        
        node_make_addmenu(C, NODE_CLASS_OP_DYNAMIC, block);
@@ -398,7 +397,7 @@ static uiBlock *node_addmenu(bContext *C, ARegion *ar, void *arg_unused)
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "node_addmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "node_addmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_node_addmenu, NULL);
        
        if(snode->treetype==NTREE_SHADER) {
@@ -519,8 +518,7 @@ static uiBlock *node_nodemenu(bContext *C, ARegion *ar, void *arg_unused)
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "node_nodemenu", 
-                                         UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "node_nodemenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_node_nodemenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Grab/Move|G", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
@@ -604,7 +602,7 @@ static uiBlock *node_viewmenu(bContext *C, ARegion *ar, void *arg_unused)
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "node_viewmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "node_viewmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_node_viewmenu, NULL);
 
        if (snode->nodetree) {
@@ -694,7 +692,7 @@ void node_header_buttons(const bContext *C, ARegion *ar)
        uiBlock *block;
        short xco, yco= 3;
        
-       block= uiBeginBlock(C, ar, "header node", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "header node", UI_EMBOSS);
        uiBlockSetHandleFunc(block, do_node_buttons, NULL);
        
        xco= ED_area_header_standardbuttons(C, block, yco);
index cf195f6..af190d1 100644 (file)
@@ -4306,7 +4306,7 @@ void draw_outliner(const bContext *C)
        outliner_draw_tree(scene, ar, soops);
 
        /* draw icons and names */
-       block= uiBeginBlock(C, ar, "outliner buttons", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "outliner buttons", UI_EMBOSS);
        outliner_buttons(block, ar, soops, &soops->tree);
        
        if(ELEM(soops->outlinevis, SO_DATABLOCKS, SO_USERDEF)) {
index ecff2d8..80ad3d2 100644 (file)
@@ -118,7 +118,7 @@ static uiBlock *outliner_viewmenu(bContext *C, ARegion *ar, void *arg_unused)
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "outliner_viewmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "outliner_viewmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_viewmenu, NULL);
        
        if (soops->flag & SO_HIDE_RESTRICTCOLS)
@@ -213,7 +213,7 @@ void outliner_header_buttons(const bContext *C, ARegion *ar)
        uiBlock *block;
        int xco, yco= 3, xmax;
        
-       block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS);
        uiBlockSetHandleFunc(block, do_outliner_buttons, NULL);
        
        xco= ED_area_header_standardbuttons(C, block, yco);
index 2a70063..78a19c5 100644 (file)
@@ -71,7 +71,7 @@ static uiBlock *dummy_viewmenu(bContext *C, ARegion *ar, void *arg_unused)
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "dummy_viewmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "dummy_viewmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_viewmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Nothing yet", 0, yco-=20, 
@@ -104,7 +104,7 @@ void script_header_buttons(const bContext *C, ARegion *ar)
        uiBlock *block;
        int xco, yco= 3;
        
-       block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS);
        uiBlockSetHandleFunc(block, do_script_buttons, NULL);
        
        xco= ED_area_header_standardbuttons(C, block, yco);
index c7f280f..4c17ed1 100644 (file)
@@ -58,6 +58,8 @@
 
 #include "ED_markers.h"
 
+#include "BPY_extern.h"
+
 #include "script_intern.h"     // own include
 
 
index 9cda3ec..aa63353 100644 (file)
@@ -78,7 +78,7 @@ static uiBlock *seq_viewmenu(bContext *C, ARegion *ar, void *arg_unused)
        SpaceSeq *sseq= sa->spacedata.first;
        View2D *v2d= UI_view2d_fromcontext(C);
 
-       uiBlock *block= uiBeginBlock(C, ar, "seq_viewmenu", UI_EMBOSSP, UI_HELV);
+       uiBlock *block= uiBeginBlock(C, ar, "seq_viewmenu", UI_EMBOSSP);
        short yco= 0, menuwidth=120;
 
        if (sseq->mainb == SEQ_DRAW_SEQUENCE) {
@@ -168,7 +168,7 @@ static uiBlock *seq_markermenu(bContext *C, ARegion *ar, void *arg_unused)
        SpaceSeq *sseq= sa->spacedata.first;
 
 
-       uiBlock *block= uiBeginBlock(C, ar, "seq_markermenu", UI_EMBOSSP, UI_HELV);
+       uiBlock *block= uiBeginBlock(C, ar, "seq_markermenu", UI_EMBOSSP);
        short yco= 0, menuwidth=120;
 
 
@@ -327,7 +327,7 @@ void sequencer_header_buttons(const bContext *C, ARegion *ar)
        Scene *scene= CTX_data_scene(C);
        Editing *ed= seq_give_editing(scene, FALSE);
        
-       uiBlock *block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS, UI_HELV);
+       uiBlock *block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS);
        int xco=3, yco= 3;
        
        xco= ED_area_header_standardbuttons(C, block, yco);
index 3eed96d..46034d6 100644 (file)
@@ -71,7 +71,7 @@ static uiBlock *dummy_viewmenu(bContext *C, ARegion *ar, void *arg_unused)
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "dummy_viewmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "dummy_viewmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_viewmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Nothing yet", 0, yco-=20, 
@@ -104,7 +104,7 @@ void sound_header_buttons(const bContext *C, ARegion *ar)
        uiBlock *block;
        int xco, yco= 3;
        
-       block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS);
        uiBlockSetHandleFunc(block, do_sound_buttons, NULL);
        
        xco= ED_area_header_standardbuttons(C, block, yco);
index 0d66176..0a8f5e9 100644 (file)
@@ -100,7 +100,7 @@ static uiBlock *text_template_scriptsmenu(bContext *C, void *args_unused)
        // int i= 0;
        // short yco = 20, menuwidth = 120;
        
-       block= uiBeginBlock(C, ar, "text_template_scriptsmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "text_template_scriptsmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_text_template_scriptsmenu, NULL);
        
        /* note that we acount for the N previous entries with i+20: */
@@ -133,7 +133,7 @@ static uiBlock *text_plugin_scriptsmenu(bContext *C, void *args_unused)
        // int i= 0;
        // short yco = 20, menuwidth = 120;
        
-       block= uiBeginBlock(C, ar, "text_plugin_scriptsmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "text_plugin_scriptsmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_text_plugin_scriptsmenu, NULL);
        
        /* note that we acount for the N previous entries with i+20: */
index 8955606..c751fbd 100644 (file)
@@ -95,7 +95,7 @@ static uiBlock *time_redrawmenu(bContext *C, ARegion *ar, void *arg_unused)
        short yco= 0, menuwidth=120, icon;
        char str[32];
        
-       block= uiBeginBlock(C, ar, "header time_redrawmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "header time_redrawmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_time_redrawmenu, NULL);
        
        if(stime->redraws & TIME_LEFTMOST_3D_WIN) icon= ICON_CHECKBOX_HLT;
@@ -215,7 +215,7 @@ static uiBlock *time_viewmenu(bContext *C, ARegion *ar, void *arg_unused)
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "time_viewmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "time_viewmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_time_viewmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Play Back Animation", 0, yco-=20,
@@ -301,7 +301,7 @@ static uiBlock *time_framemenu(bContext *C, ARegion *ar, void *arg_unused)
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "time_framemenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "time_framemenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_time_framemenu, NULL);
 
        uiDefIconTextButO(block, BUTM, "MARKER_OT_add", WM_OP_EXEC_REGION_WIN, ICON_BLANK1, "Add Marker",
@@ -432,7 +432,7 @@ void time_header_buttons(const bContext *C, ARegion *ar)
        int xco, yco= 3;
        char *menustr= NULL;
        
-       block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS);
        uiBlockSetHandleFunc(block, do_time_buttons, NULL);
        
        xco= ED_area_header_standardbuttons(C, block, yco);
index 86e5fcf..a3a8d69 100644 (file)
@@ -956,7 +956,7 @@ static void view3d_panel_transform_spaces(const bContext *C, ARegion *ar, short
        int xco = 20, yco = 70, height = 140;
        int index;
 
-       block= uiBeginBlock(C, ar, "view3d_panel_transform", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_panel_transform", UI_EMBOSS);
        if(uiNewPanel(C, ar, block, "Transform Orientations", "View3d", 1000, 0, 318, height)==0) return;
 
        uiNewPanelHeight(block, height);
@@ -1112,7 +1112,7 @@ static void view3d_panel_brush(const bContext *C, ARegion *ar, short cntrl)
                return;
        br = *brp;
 
-       block= uiBeginBlock(C, ar, "view3d_panel_brush", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_panel_brush", UI_EMBOSS);
        if(uiNewPanel(C, ar, block, "Brush", "View3d", 340, 10, 318, h)==0) return;
        uiBlockSetHandleFunc(block, do_view3d_region_buttons, NULL);
 
@@ -1220,7 +1220,7 @@ static void view3d_panel_object(const bContext *C, ARegion *ar, short cntrl)      //
                v3d->properties_storage= MEM_callocN(sizeof(TransformProperties), "TransformProperties");
        tfp= v3d->properties_storage;
        
-       block= uiBeginBlock(C, ar, "view3d_panel_object", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_panel_object", UI_EMBOSS);
        uiBlockSetHandleFunc(block, do_view3d_region_buttons, NULL);
        
        if((G.f & G_SCULPTMODE) && !obedit) {
@@ -1371,7 +1371,7 @@ static void view3d_panel_background(const bContext *C, ARegion *ar, short cntrl)
        View3D *v3d= CTX_wm_view3d(C);
        uiBlock *block;
 
-       block= uiBeginBlock(C, ar, "view3d_panel_background", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_panel_background", UI_EMBOSS);
        if(uiNewPanel(C, ar, block, "Background Image", "View3d", 340, 10, 318, 204)==0) return;
        uiBlockSetHandleFunc(block, do_view3d_region_buttons, NULL);
 
@@ -1415,7 +1415,7 @@ static void view3d_panel_properties(const bContext *C, ARegion *ar, short cntrl)
        uiBlock *block;
        float *curs;
 
-       block= uiBeginBlock(C, ar, "view3d_panel_properties", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_panel_properties", UI_EMBOSS);
        if(uiNewPanel(C, ar, block, "View Properties", "View3d", 340, 30, 318, 254)==0) return;
        uiBlockSetHandleFunc(block, do_view3d_region_buttons, NULL);
 
@@ -1506,7 +1506,7 @@ static void view3d_panel_preview(bContext *C, ARegion *ar, short cntrl)   // VIEW3
        View3D *v3d= sa->spacedata.first;
        int ofsx, ofsy;
        
-       block= uiBeginBlock(C, ar, "view3d_panel_preview", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_panel_preview", UI_EMBOSS);
        uiPanelControl(UI_PNL_SOLID | UI_PNL_CLOSE | UI_PNL_SCALE | cntrl);
        uiSetPanelHandler(VIEW3D_HANDLER_PREVIEW);  // for close and esc
        
@@ -1530,7 +1530,7 @@ static void view3d_panel_gpencil(const bContext *C, ARegion *ar, short cntrl)     //
        View3D *v3d= CTX_wm_view3d(C);
        uiBlock *block;
 
-       block= uiBeginBlock(C, ar, "view3d_panel_gpencil", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_panel_gpencil", UI_EMBOSS);
        if (uiNewPanel(C, ar, block, "Grease Pencil", "View3d", 100, 30, 318, 204)==0) return;
 
        /* allocate memory for gpd if drawing enabled (this must be done first or else we crash) */
@@ -1599,7 +1599,7 @@ static void view3d_panel_bonesketch_spaces(const bContext *C, ARegion *ar, short
                        };
 
                
-               block= uiBeginBlock(C, ar, "view3d_panel_bonesketch_spaces", UI_EMBOSS, UI_HELV);
+               block= uiBeginBlock(C, ar, "view3d_panel_bonesketch_spaces", UI_EMBOSS);
                if(uiNewPanel(C, ar, block, "Bone Sketching", "View3d", 340, 10, 318, height)==0) return;
                uiBlockSetHandleFunc(block, do_view3d_region_buttons, NULL);
        
index cfb4170..acbab54 100644 (file)
@@ -356,7 +356,7 @@ static uiBlock *view3d_view_camerasmenu(bContext *C, ARegion *ar, void *arg_unus
        int i=1;
        char camname[48];
        
-       block= uiBeginBlock(C, ar, "view3d_view_camerasmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_view_camerasmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_view_camerasmenu, NULL);
 
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Set Active Object as Active Camera|Ctrl NumPad 0",       0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 1, "");
@@ -442,7 +442,7 @@ static uiBlock *view3d_view_cameracontrolsmenu(bContext *C, ARegion *ar, void *a
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "view3d_view_cameracontrolsmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_view_cameracontrolsmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_view_cameracontrolsmenu, NULL);
 
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Camera Fly Mode|Shift F",        0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 11, "");
@@ -533,7 +533,7 @@ static uiBlock *view3d_view_alignviewmenu(bContext *C, ARegion *ar, void *arg_un
        Object *obedit = CTX_data_edit_object(C);
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "view3d_view_alignviewmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_view_alignviewmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_view_alignviewmenu, NULL);
 
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Center View to Cursor|C",                        0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 3, "");
@@ -706,7 +706,7 @@ static uiBlock *view3d_viewmenu(bContext *C, ARegion *ar, void *arg_unused)
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "view3d_viewmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_viewmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_viewmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "Transform Orientations...",  0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 20, "");
@@ -837,7 +837,7 @@ static uiBlock *view3d_select_object_typemenu(bContext *C, ARegion *ar, void *ar
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_select_object_typemenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_select_object_typemenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_select_object_typemenu, NULL);
 
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Mesh",           0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
@@ -899,7 +899,7 @@ static uiBlock *view3d_select_object_layermenu(bContext *C, ARegion *ar, void *a
        uiBlock *block;
        short xco= 0, yco = 20, menuwidth = 22;
 
-       block= uiBeginBlock(C, ar, "view3d_select_object_layermenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_select_object_layermenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_select_object_layermenu, NULL);
 
        uiDefBut(block, BUTM, 1, "1",           xco, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
@@ -949,7 +949,7 @@ static uiBlock *view3d_select_object_linkedmenu(bContext *C, ARegion *ar, void *
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_select_object_linkedmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_select_object_linkedmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_select_object_linkedmenu, NULL);
 
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Object Ipo|Shift L, 1",          0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
@@ -987,7 +987,7 @@ static uiBlock *view3d_select_object_groupedmenu(bContext *C, ARegion *ar, void
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_select_object_groupedmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_select_object_groupedmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_select_object_groupedmenu, NULL);
 
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Children|Shift G, 1",            0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
@@ -1014,7 +1014,7 @@ static uiBlock *view3d_select_objectmenu(bContext *C, ARegion *ar, void *arg_unu
        uiBlock *block;
 //     short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "view3d_select_objectmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_select_objectmenu", UI_EMBOSSP);
        
 #if 0
        uiBlockSetButmFunc(block, do_view3d_select_objectmenu, NULL);
@@ -1134,7 +1134,7 @@ static uiBlock *view3d_select_meshmenu(bContext *C, ARegion *ar, void *arg_unuse
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "view3d_select_meshmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_select_meshmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_select_meshmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Border Select|B",                                0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
@@ -1277,7 +1277,7 @@ static uiBlock *view3d_select_metaballmenu(bContext *C, ARegion *ar, void *arg_u
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "view3d_select_metaballmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_select_metaballmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_select_metaballmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Border Select|B", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
@@ -1325,7 +1325,7 @@ static uiBlock *view3d_select_latticemenu(bContext *C, ARegion *ar, void *arg_un
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "view3d_select_latticemenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_select_latticemenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_select_latticemenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Border Select|B",                                0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
@@ -1382,7 +1382,7 @@ static uiBlock *view3d_select_armaturemenu(bContext *C, ARegion *ar, void *arg_u
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "view3d_select_armaturemenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_select_armaturemenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_select_armaturemenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Border Select|B",                                0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
@@ -1453,7 +1453,7 @@ static uiBlock *view3d_select_pose_armaturemenu(bContext *C, ARegion *ar, void *
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "view3d_select_pose_armaturemenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_select_pose_armaturemenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_select_pose_armaturemenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Border Select|B",                                0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
@@ -1520,7 +1520,7 @@ static uiBlock *view3d_select_faceselmenu(bContext *C, ARegion *ar, void *arg_un
 //     int i = 0;
 #endif
 
-       block= uiBeginBlock(C, ar, "view3d_select_faceselmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_select_faceselmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_select_faceselmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Border Select|B",                                0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
@@ -1591,7 +1591,7 @@ static uiBlock *view3d_edit_snapmenu(bContext *C, ARegion *ar, void *arg_unused)
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_edit_snapmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_edit_snapmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_edit_snapmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Selection -> Grid|Shift S, 1",                   0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
@@ -1657,7 +1657,7 @@ static uiBlock *view3d_transform_moveaxismenu(bContext *C, ARegion *ar, void *ar
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_transform_moveaxismenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_transform_moveaxismenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_transform_moveaxismenu, NULL);
 
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "X Global|G, X",  0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
@@ -1724,7 +1724,7 @@ static uiBlock *view3d_transform_rotateaxismenu(bContext *C, ARegion *ar, void *
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_transform_rotateaxismenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_transform_rotateaxismenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_transform_rotateaxismenu, NULL);
 
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "X Global|R, X",  0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
@@ -1791,7 +1791,7 @@ static uiBlock *view3d_transform_scaleaxismenu(bContext *C, ARegion *ar, void *a
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_transform_scaleaxismenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_transform_scaleaxismenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_transform_scaleaxismenu, NULL);
 
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "X Global|S, X",  0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
@@ -1903,7 +1903,7 @@ static uiBlock *view3d_transformmenu(bContext *C, ARegion *ar, void *arg_unused)
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_transformmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_transformmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_transformmenu, NULL);
 
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Grab/Move|G",    0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
@@ -2029,7 +2029,7 @@ static uiBlock *view3d_object_mirrormenu(bContext *C, ARegion *ar, void *arg_unu
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_object_mirrormenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_object_mirrormenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_object_mirrormenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Interactive Mirror|Ctrl M",                      0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
@@ -2080,7 +2080,7 @@ static uiBlock *view3d_edit_object_transformmenu(bContext *C, ARegion *ar, void
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_edit_object_transformmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_edit_object_transformmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_edit_object_transformmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Apply Scale/Rotation to ObData|Ctrl A, 1",                       0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 6, "");
@@ -2118,7 +2118,7 @@ static uiBlock *view3d_edit_object_makelocalmenu(bContext *C, ARegion *ar, void
        uiBlock *block;
        short yco = 20, menuwidth = 120;
        
-       block= uiBeginBlock(C, ar, "view3d_edit_object_makelocalmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_edit_object_makelocalmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_edit_object_makelocalmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Selected Objects|L, 1",                  0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
@@ -2152,7 +2152,7 @@ static uiBlock *view3d_edit_object_makelinksmenu(bContext *C, ARegion *ar, void
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_edit_object_makelinksmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_edit_object_makelinksmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_edit_object_makelinksmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "To Scene...|Ctrl L, 1",                  0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
@@ -2229,7 +2229,7 @@ static uiBlock *view3d_edit_object_singleusermenu(bContext *C, ARegion *ar, void
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_edit_object_singleusermenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_edit_object_singleusermenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_edit_object_singleusermenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Object|U, 1",                    0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
@@ -2282,7 +2282,7 @@ static uiBlock *view3d_edit_object_copyattrmenu(bContext *C, ARegion *ar, void *
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_edit_object_copyattrmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_edit_object_copyattrmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_edit_object_copyattrmenu, NULL);
        
        ob= OBACT;
@@ -2357,7 +2357,7 @@ static uiBlock *view3d_edit_object_parentmenu(bContext *C, ARegion *ar, void *ar
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_edit_object_parentmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_edit_object_parentmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_edit_object_parentmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Make Parent...|Ctrl P",                  0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
@@ -2386,7 +2386,7 @@ static uiBlock *view3d_edit_object_groupmenu(bContext *C, ARegion *ar, void *arg
        uiBlock *block;
        short yco = 20, menuwidth = 120;
        
-       block= uiBeginBlock(C, ar, "view3d_edit_object_groupmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_edit_object_groupmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_edit_object_groupmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Add to Existing Group|Ctrl G, 1",        0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
@@ -2417,7 +2417,7 @@ static uiBlock *view3d_edit_object_trackmenu(bContext *C, ARegion *ar, void *arg
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_edit_object_trackmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_edit_object_trackmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_edit_object_trackmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Make Track...|Ctrl T",                   0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
@@ -2447,7 +2447,7 @@ static uiBlock *view3d_edit_object_constraintsmenu(bContext *C, ARegion *ar, voi
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_edit_object_constraintsmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_edit_object_constraintsmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_edit_object_constraintsmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Add Constraint...|Ctrl Alt C",                   0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
@@ -2482,7 +2482,7 @@ static uiBlock *view3d_edit_object_showhidemenu(bContext *C, ARegion *ar, void *
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_edit_object_showhidemenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_edit_object_showhidemenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_edit_object_showhidemenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Hidden|Alt H",                      0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
@@ -2510,7 +2510,7 @@ static uiBlock *view3d_edit_object_scriptsmenu(bContext *C, ARegion *ar, void *a
 // XXX BPyMenu *pym;
 //     int i = 0;
 
-       block= uiBeginBlock(C, ar, "v3d_eobject_pymenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "v3d_eobject_pymenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_edit_object_scriptsmenu, NULL);
 
 //     for (pym = BPyMenuTable[PYMENU_OBJECT]; pym; pym = pym->next, i++) {
@@ -2583,7 +2583,7 @@ static uiBlock *view3d_edit_objectmenu(bContext *C, ARegion *ar, void *arg_unuse
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "view3d_edit_objectmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_edit_objectmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_edit_objectmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "Transform Properties|N",             0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 15, "");
@@ -2664,7 +2664,7 @@ static uiBlock *view3d_edit_propfalloffmenu(bContext *C, ARegion *ar, void *arg_
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_edit_propfalloffmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_edit_propfalloffmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_edit_propfalloffmenu, NULL);
        
        if (scene->prop_mode==PROP_SMOOTH) uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "Smooth|Shift O", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, PROP_SMOOTH, "");
@@ -2735,7 +2735,7 @@ static uiBlock *view3d_edit_mesh_verticesmenu(bContext *C, ARegion *ar, void *ar
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_edit_mesh_verticesmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_edit_mesh_verticesmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_edit_mesh_verticesmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Merge...|Alt M",                 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 5, "");
@@ -2853,7 +2853,7 @@ static uiBlock *view3d_edit_mesh_edgesmenu(bContext *C, ARegion *ar, void *arg_u
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_edit_mesh_edgesmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_edit_mesh_edgesmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_edit_mesh_edgesmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Make Edge/Face|F",                       0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 5, "");
@@ -2941,7 +2941,7 @@ static uiBlock *view3d_edit_mesh_facesmenu(bContext *C, ARegion *ar, void *arg_u
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_edit_mesh_facesmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_edit_mesh_facesmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_edit_mesh_facesmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Make Edge/Face|F",               0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 5, "");
@@ -2987,7 +2987,7 @@ static uiBlock *view3d_edit_mesh_normalsmenu(bContext *C, ARegion *ar, void *arg
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_edit_mesh_normalsmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_edit_mesh_normalsmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_edit_mesh_normalsmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Recalculate Outside|Ctrl N",                     0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
@@ -3053,7 +3053,7 @@ static uiBlock *view3d_edit_mirrormenu(bContext *C, ARegion *ar, void *arg_unuse
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_edit_mirrormenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_edit_mirrormenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_edit_mirrormenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Interactive Mirror|Ctrl M",                      0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
@@ -3099,7 +3099,7 @@ static uiBlock *view3d_edit_mesh_showhidemenu(bContext *C, ARegion *ar, void *ar
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_edit_mesh_showhidemenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_edit_mesh_showhidemenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_edit_mesh_showhidemenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Hidden|Alt H",                      0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
@@ -3127,7 +3127,7 @@ static uiBlock *view3d_edit_mesh_scriptsmenu(bContext *C, ARegion *ar, void *arg
 // XXX BPyMenu *pym;
 //     int i = 0;
 
-       block= uiBeginBlock(C, ar, "v3d_emesh_pymenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "v3d_emesh_pymenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_edit_mesh_scriptsmenu, NULL);
 
 //     for (pym = BPyMenuTable[PYMENU_MESH]; pym; pym = pym->next, i++) {
@@ -3211,7 +3211,7 @@ static uiBlock *view3d_edit_meshmenu(bContext *C, ARegion *ar, void *arg_unused)
        uiBlock *block;
        short yco= 0, menuwidth=120;
                
-       block= uiBeginBlock(C, ar, "view3d_edit_meshmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_edit_meshmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_edit_meshmenu, NULL);
 
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Undo Editing|Ctrl Z",            0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
@@ -3391,7 +3391,7 @@ static uiBlock *view3d_edit_mball_showhidemenu(bContext *C, ARegion *ar, void *a
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_edit_mball_showhidemenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_edit_mball_showhidemenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_edit_mball_showhidemenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Hidden|Alt H", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 10, "");
@@ -3442,7 +3442,7 @@ static uiBlock *view3d_edit_metaballmenu(bContext *C, ARegion *ar, void *arg_unu
        uiBlock *block;
        short yco= 0, menuwidth=120;
                
-       block= uiBeginBlock(C, ar, "view3d_edit_metaballmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_edit_metaballmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_edit_metaballmenu, NULL);
 
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Undo Editing|Ctrl Z", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
@@ -3554,7 +3554,7 @@ static uiBlock *view3d_edit_latticemenu(bContext *C, ARegion *ar, void *arg_unus
        uiBlock *block;
        short yco= 0, menuwidth=120;
                
-       block= uiBeginBlock(C, ar, "view3d_edit_latticemenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_edit_latticemenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_edit_latticemenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Undo Editing|U",         0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
@@ -3614,7 +3614,7 @@ static uiBlock *view3d_edit_armature_parentmenu(bContext *C, ARegion *ar, void *
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_edit_armature_parentmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_edit_armature_parentmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_edit_armature_parentmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Make Parent...|Ctrl P",  0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
@@ -3644,7 +3644,7 @@ static uiBlock *view3d_edit_armature_rollmenu(bContext *C, ARegion *ar, void *ar
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_edit_armature_rollmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_edit_armature_rollmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_edit_armature_rollmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Clear Roll (Z-Axis Up)|Ctrl N, 1",       0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
@@ -3744,7 +3744,7 @@ static uiBlock *view3d_scripts_armaturemenu(bContext *C, ARegion *ar, void *arg_
 //     int i= 0;
 //     short yco = 20, menuwidth = 120;
        
-       block= uiBeginBlock(C, ar, "view3d_scripts_armaturemenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_scripts_armaturemenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_scripts_armaturemenu, NULL);
        
        /* note that we acount for the N previous entries with i+20: */
@@ -3772,7 +3772,7 @@ static uiBlock *view3d_armature_settingsmenu(bContext *C, ARegion *ar, void *arg
        uiBlock *block;
        short yco= 0, menuwidth=120;
 
-       block= uiBeginBlock(C, ar, "view3d_armature_settingsmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_armature_settingsmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_armature_settingsmenu, NULL);
 
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Toggle a Setting|Shift W", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 0, "");
@@ -3792,7 +3792,7 @@ static uiBlock *view3d_edit_armaturemenu(bContext *C, ARegion *ar, void *arg_unu
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "view3d_edit_armaturemenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_edit_armaturemenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_edit_armaturemenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Undo Editing|U",         0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
@@ -3894,7 +3894,7 @@ static uiBlock *view3d_pose_armature_transformmenu(bContext *C, ARegion *ar, voi
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_pose_armature_transformmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_pose_armature_transformmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_pose_armature_transformmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Clear User Transform|W", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, "");
@@ -3933,7 +3933,7 @@ static uiBlock *view3d_pose_armature_showhidemenu(bContext *C, ARegion *ar, void
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_pose_armature_showhidemenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_pose_armature_showhidemenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_pose_armature_showhidemenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Hidden|Alt H",                      0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
@@ -3966,7 +3966,7 @@ static uiBlock *view3d_pose_armature_ikmenu(bContext *C, ARegion *ar, void *arg_
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_pose_armature_ikmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_pose_armature_ikmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_pose_armature_ikmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Add IK to Bone...|Shift I",                      0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
@@ -3998,7 +3998,7 @@ static uiBlock *view3d_pose_armature_constraintsmenu(bContext *C, ARegion *ar, v
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_pose_armature_constraintsmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_pose_armature_constraintsmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_pose_armature_constraintsmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Add Constraint to Bone...|Ctrl Alt C",                   0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
@@ -4037,7 +4037,7 @@ static uiBlock *view3d_pose_armature_groupmenu(bContext *C, ARegion *ar, void *a
        uiBlock *block;
        short yco = 20, menuwidth = 120;
        
-       block= uiBeginBlock(C, ar, "view3d_pose_armature_groupmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_pose_armature_groupmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_pose_armature_groupmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Add Selected to Active Group|Ctrl G",    0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
@@ -4072,7 +4072,7 @@ static uiBlock *view3d_pose_armature_motionpathsmenu(bContext *C, ARegion *ar, v
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_pose_armature_motionpathsmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_pose_armature_motionpathsmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_pose_armature_motionpathsmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Calculate Paths|W",                      0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
@@ -4111,7 +4111,7 @@ static uiBlock *view3d_pose_armature_poselibmenu(bContext *C, ARegion *ar, void
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_pose_armature_poselibmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_pose_armature_poselibmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_pose_armature_poselibmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Browse Poses|Ctrl L",                    0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
@@ -4192,7 +4192,7 @@ static uiBlock *view3d_pose_armaturemenu(bContext *C, ARegion *ar, void *arg_unu
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "view3d_pose_armaturemenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_pose_armaturemenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_pose_armaturemenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "Transform Properties|N", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
@@ -4293,7 +4293,7 @@ static uiBlock *view3d_vpaintmenu(bContext *C, ARegion *ar, void *arg_unused)
 //     int i=0;
 #endif
        
-       block= uiBeginBlock(C, ar, "view3d_paintmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_paintmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_vpaintmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Undo Vertex Painting|U",         0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
@@ -4341,7 +4341,7 @@ static uiBlock *view3d_tpaintmenu(bContext *C, ARegion *ar, void *arg_unused)
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "view3d_paintmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_paintmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_tpaintmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Undo Texture Painting|U",                0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
@@ -4395,7 +4395,7 @@ static uiBlock *view3d_wpaintmenu(bContext *C, ARegion *ar, void *arg_unused)
 //     int i=0;
 #endif
                
-       block= uiBeginBlock(C, ar, "view3d_paintmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_paintmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_wpaintmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Undo Weight Painting|U",         0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
@@ -4517,7 +4517,7 @@ uiBlock *view3d_sculpt_inputmenu(bContext *C, ARegion *ar, void *arg_unused)
        short yco= 0, menuwidth= 120;
        Sculpt *sd= CTX_data_tool_settings(C)->sculpt;
 
-       block= uiBeginBlock(C, ar, "view3d_sculpt_inputmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_sculpt_inputmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_sculpt_inputmenu, NULL);
 
        uiDefIconTextBut(block, BUTM, 1, ((sd->flags & SCULPT_INPUT_SMOOTH) ? ICON_CHECKBOX_HLT : ICON_CHECKBOX_DEHLT), "Smooth Stroke|Shift S", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
@@ -4572,7 +4572,7 @@ uiBlock *view3d_sculptmenu(bContext *C, ARegion *ar, void *arg_unused)
 // XXX const BrushData *br= sculptmode_brush();
        short yco= 0, menuwidth= 120;
        
-       block= uiBeginBlock(C, ar, "view3d_sculptmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_sculptmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_sculptmenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "Sculpt Properties|N", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 14, "");
@@ -4637,7 +4637,7 @@ static uiBlock *view3d_facesel_showhidemenu(bContext *C, ARegion *ar, void *arg_
        uiBlock *block;
        short yco = 20, menuwidth = 120;
 
-       block= uiBeginBlock(C, ar, "view3d_facesel_showhidemenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_facesel_showhidemenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_facesel_showhidemenu, NULL);
        
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Hidden Faces|Alt H",                0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, "");
@@ -4671,7 +4671,7 @@ static uiBlock *view3d_faceselmenu(bContext *C, ARegion *ar, void *arg_unused)
        uiBlock *block;
        short yco= 0, menuwidth=120;
        
-       block= uiBeginBlock(C, ar, "view3d_faceselmenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_faceselmenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_view3d_faceselmenu, NULL);
 
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Set Vertex Colors|Shift K",              0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
@@ -5279,7 +5279,7 @@ void view3d_header_buttons(const bContext *C, ARegion *ar)
        uiBlock *block;
        int a, xco, yco= 3;
        
-       block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS);
        uiBlockSetHandleFunc(block, do_view3d_header_buttons, NULL);
        
        xco= ED_area_header_standardbuttons(C, block, yco);
index 0064317..7f47bfd 100644 (file)
 #include "DNA_space_types.h"
 #include "DNA_view3d_types.h"
 
-//#include "BIF_screen.h"
-//#include "BIF_resources.h"
-//#include "BIF_mywindow.h"
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
 
+#include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_utildefines.h"
 
index 12d7bef..56ae3a3 100644 (file)
@@ -3505,14 +3505,6 @@ void flushTransGraphData(TransInfo *t)
 
 /* **************** IpoKey stuff, for Object TransData ********** */
 
-/* storage of bezier triple. thats why -3 and +3! */
-static void set_tdi_old(float *old, float *poin)
-{
-       old[0]= *(poin);
-       old[3]= *(poin-3);
-       old[6]= *(poin+3);
-}
-
 /* while transforming */
 void add_tdi_poin(float *poin, float *old, float delta)
 {
@@ -3523,8 +3515,16 @@ void add_tdi_poin(float *poin, float *old, float delta)
        }
 }
 
-/* fill ipokey transdata with old vals and pointers */
 #if 0 // TRANSFORM_FIX_ME
+/* storage of bezier triple. thats why -3 and +3! */
+static void set_tdi_old(float *old, float *poin)
+{
+       old[0]= *(poin);
+       old[3]= *(poin-3);
+       old[6]= *(poin+3);
+}
+
+/* fill ipokey transdata with old vals and pointers */
 static void ipokey_to_transdata(IpoKey *ik, TransData *td)
 {
        extern int ob_ar[];             // blenkernel ipo.c
index d813069..8484ad7 100644 (file)
@@ -343,7 +343,7 @@ uiBlock *editmode_undohistorymenu(bContext *C, ARegion *ar, void *arg_unused)
        
        undo_clean_stack(C);    // removes other objects from it
 
-       block= uiBeginBlock(C, ar, "view3d_edit_mesh_undohistorymenu", UI_EMBOSSP, UI_HELV);
+       block= uiBeginBlock(C, ar, "view3d_edit_mesh_undohistorymenu", UI_EMBOSSP);
        uiBlockSetButmFunc(block, do_editmode_undohistorymenu, NULL);
        
        for(uel= undobase.first; uel; uel= uel->next, item++) {
index e85f347..c1a0e72 100644 (file)
@@ -242,14 +242,12 @@ typedef struct UserDef {
        short userpref, viewzoom;
        
        int mixbufsize;
-       int fontsize;   // XXX old
+       int pad1;
        int dpi;                /* range 48-128? */
        short encoding;
        short transopts;
        short menuthreshold1, menuthreshold2;
        
-       char fontname[256];             // XXX FILE_MAXDIR+FILE length
-       
        struct ListBase themes;
        struct ListBase uifonts;
        struct ListBase uistyles;
index 6fb6a67..1b73ae9 100644 (file)
@@ -252,7 +252,7 @@ static void def_vector_curve(BlenderRNA *brna, int id)
 static void def_val_to_rgb(BlenderRNA *brna, int id)
 {
        StructRNA *srna;
-       PropertyRNA *prop;
+//     PropertyRNA *prop;
        
        srna= def_node(brna, id);
        
index 60ab2e9..74faa0f 100644 (file)
@@ -1508,14 +1508,10 @@ static void rna_def_userdef_language(BlenderRNA *brna)
        RNA_def_property_boolean_sdna(prop, NULL, "transopts", USER_DOTRANSLATE);
        RNA_def_property_ui_text(prop, "International Fonts", "Use international fonts.");
 
-       prop= RNA_def_property(srna, "font_size", PROP_INT, PROP_NONE);
-       RNA_def_property_int_sdna(prop, NULL, "fontsize");
-       RNA_def_property_range(prop, 8, 16);
-       RNA_def_property_ui_text(prop, "Font Size", "International font size (points).");
-
-       prop= RNA_def_property(srna, "font_filename", PROP_STRING, PROP_FILEPATH);
-       RNA_def_property_string_sdna(prop, NULL, "fontname");
-       RNA_def_property_ui_text(prop, "Font Filename", "International font filename.");
+       prop= RNA_def_property(srna, "dpi", PROP_INT, PROP_NONE);
+       RNA_def_property_int_sdna(prop, NULL, "dpi");
+       RNA_def_property_range(prop, 48, 128);
+       RNA_def_property_ui_text(prop, "DPI", "Font size and resolution for display.");
 
        /* Language Selection */
 
index f6273c6..cfedb1f 100644 (file)
@@ -31,6 +31,8 @@
 #include "BKE_context.h"
 #include "BKE_text.h"
 
+#include "BPY_extern.h"
+
 void BPY_free_compiled_text( struct Text *text )
 {
        if( text->compiled ) {
@@ -59,6 +61,13 @@ static void bpy_init_modules( void )
        Py_DECREF(mod);
 }
 
+#if (PY_VERSION_HEX < 0x02050000)
+PyObject *PyImport_ImportModuleLevel(char *name, void *a, void *b, void *c, int d)
+{
+       return PyImport_ImportModule(name);
+}
+#endif
+
 void BPY_update_modules( void )
 {
        PyObject *mod= PyImport_ImportModuleLevel("bpy", NULL, NULL, NULL, 0);
@@ -106,7 +115,7 @@ static PyObject *CreateGlobalDictionary( bContext *C )
        return dict;
 }
 
-void BPY_start_python( void )
+void BPY_start_python( int argc, char **argv )
 {
        PyThreadState *py_tstate = NULL;
        
@@ -244,7 +253,7 @@ static int bpy_run_script_init(bContext *C, SpaceScript * sc)
        return 1;
 }
 
-int BPY_run_script_space_draw(bContext *C, SpaceScript * sc)
+int BPY_run_script_space_draw(struct bContext *C, SpaceScript * sc)
 {
        if (bpy_run_script_init(C, sc)) {
                PyGILState_STATE gilstate = PyGILState_Ensure();
@@ -334,7 +343,7 @@ int BPY_run_python_script_space(const char *modulename, const char *func)
 #endif
 
 /* XXX this is temporary, need a proper script registration system for 2.5 */
-void BPY_run_ui_scripts(void)
+void BPY_run_ui_scripts(bContext *C)
 {
 #ifdef TIME_REGISTRATION
        double time = PIL_check_seconds_timer();
index 7db9808..b53cc52 100644 (file)
@@ -158,7 +158,9 @@ static PyObject *Method_pupBlock( PyObject * self, PyObject * args )
        Py_RETURN_NONE;
 }
 
-static PyObject *Method_beginBlock( PyObject * self, PyObject * args ) // XXX missing 2 args - UI_EMBOSS, UI_HELV, do we care?
+// XXX missing arg - UI_EMBOSS, do we care?
+// XXX well, right now this only is to distinguish whether we have regular buttons or for pulldowns (ton)
+static PyObject *Method_beginBlock( PyObject * self, PyObject * args ) 
 {
        PyObject *py_context, *py_ar;
        char *name;
@@ -166,7 +168,7 @@ static PyObject *Method_beginBlock( PyObject * self, PyObject * args ) // XXX mi
        if( !PyArg_ParseTuple( args, "O!O!s:beginBlock", &PyCObject_Type, &py_context, &PyCObject_Type, &py_ar, &name) )
                return NULL;
        
-       return PyCObject_FromVoidPtr(uiBeginBlock(PyCObject_AsVoidPtr(py_context), PyCObject_AsVoidPtr(py_ar), name, UI_EMBOSS, UI_HELV), NULL);
+       return PyCObject_FromVoidPtr(uiBeginBlock(PyCObject_AsVoidPtr(py_context), PyCObject_AsVoidPtr(py_ar), name, UI_EMBOSS), NULL);
 }
 
 static PyObject *Method_endBlock( PyObject * self, PyObject * args )
index e17d98f..36b442c 100644 (file)
@@ -268,7 +268,7 @@ static uiBlock *wm_block_create_redo(bContext *C, ARegion *ar, void *arg_op)
        uiBlock *block;
        int height;
        
-       block= uiBeginBlock(C, ar, "redo_popup", UI_EMBOSS, UI_HELV);
+       block= uiBeginBlock(C, ar, "redo_popup", UI_EMBOSS);
        uiBlockClearFlag(block, UI_BLOCK_LOOP);
        uiBlockSetFlag(block, UI_BLOCK_KEEP_OPEN|UI_BLOCK_RET_1);
        uiBlockSetFunc(block, redo_cb, arg_op, NULL);