Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2009-04-14 19:59:52 +0400
committerTon Roosendaal <ton@blender.org>2009-04-14 19:59:52 +0400
commit5b3d7bfdf6305e880f89d58cbe852a8d2ba7b241 (patch)
treecbe98c77a1d09dcdbc4a1e4130860d5bd3165a3e /source/blender/editors/space_buttons
parent3ef247eed953ea28aca2bc92879ff1c32f04b7f4 (diff)
2.5
More cleanup! - removed old UI font completely, including from uiBeginBlock - emboss hints for uiBlock only have three types now; Regular, Pulldown, or "Nothing" (only icon/text) - removed old font path from Userdef - removed all old button theme hinting - removed old "auto block" to merge buttons in groups (was only in use for radiosity buttons) And went over all warnings. One hooray for make giving clean output :) Well, we need uniform definitions for warnings, so people at least fix them... here's the real bad bugs I found: - in mesh code, a call to editmesh mixed *em and *me - in armature, ED_util.h was not included, so no warnings for wrong call to ED_undo_push() - The extern Py api .h was not included in the bpy_interface.c, showing a several calls using different args. Further just added the missing includes, and removed unused vars.
Diffstat (limited to 'source/blender/editors/space_buttons')
-rw-r--r--source/blender/editors/space_buttons/buttons_header.c4
-rw-r--r--source/blender/editors/space_buttons/buttons_scene.c12
-rw-r--r--source/blender/editors/space_buttons/space_buttons.c3
3 files changed, 6 insertions, 13 deletions
diff --git a/source/blender/editors/space_buttons/buttons_header.c b/source/blender/editors/space_buttons/buttons_header.c
index cc3dfa63e74..a09b7320468 100644
--- a/source/blender/editors/space_buttons/buttons_header.c
+++ b/source/blender/editors/space_buttons/buttons_header.c
@@ -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);
diff --git a/source/blender/editors/space_buttons/buttons_scene.c b/source/blender/editors/space_buttons/buttons_scene.c
index 3d1be595383..d0a78e7f99e 100644
--- a/source/blender/editors/space_buttons/buttons_scene.c
+++ b/source/blender/editors/space_buttons/buttons_scene.c
@@ -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");
diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c
index 2800934ef8a..5588343d223 100644
--- a/source/blender/editors/space_buttons/space_buttons.c
+++ b/source/blender/editors/space_buttons/space_buttons.c
@@ -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);