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>2004-10-31 13:52:38 +0300
committerTon Roosendaal <ton@blender.org>2004-10-31 13:52:38 +0300
commitc00d9217399f75fed373f4835cb5edbe999ee2ad (patch)
treef3bd7b8a3759b2b3b0860f386570bee5adfd4f1b /source/blender/src
parent13e7525152e9bd7f187bcc89adfd50c5ac4d37ff (diff)
Three cosmetic changes;
- removed obsolete ">>" from several menu buttons - removed convert to cardinal/bspline buttons, dont work you know :) - made sure a HOME event on ActionWindow works on epty window too
Diffstat (limited to 'source/blender/src')
-rw-r--r--source/blender/src/buttons_editing.c6
-rw-r--r--source/blender/src/buttons_scene.c8
-rw-r--r--source/blender/src/header_action.c9
3 files changed, 13 insertions, 10 deletions
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index ac2c3078bc7..9d6c468ce5f 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -1164,10 +1164,8 @@ static void editing_panel_curve_tools(Object *ob, Curve *cu)
uiDefBut(block, LABEL, 0, "Convert", 463,173,72, 18, 0, 0, 0, 0, 0, "");
uiBlockBeginAlign(block);
uiDefBut(block, BUT,B_CONVERTPOLY,"Poly", 467,152,72, 18, 0, 0, 0, 0, 0, "");
- uiDefBut(block, BUT,B_CONVERTBEZ,"Bezier", 467,132,72, 18, 0, 0, 0, 0, 0, "");
- uiDefBut(block, BUT,B_CONVERTBSPL,"Bspline", 467,112,72, 18, 0, 0, 0, 0, 0, "");
- uiDefBut(block, BUT,B_CONVERTCARD,"Cardinal", 467,92,72, 18, 0, 0, 0, 0, 0, "");
- uiDefBut(block, BUT,B_CONVERTNURB,"Nurb", 467,72,72, 18, 0, 0, 0, 0, 0, "");
+ uiDefBut(block, BUT,B_CONVERTBEZ,"Bezier", 467,132,72, 18, 0, 0, 0, 0, 0, "");
+ uiDefBut(block, BUT,B_CONVERTNURB,"Nurb", 467,112,72, 18, 0, 0, 0, 0, 0, "");
}
uiBlockBeginAlign(block);
uiDefBut(block, BUT,B_UNIFU,"Uniform U", 565,152,102, 18, 0, 0, 0, 0, 0, "");
diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c
index 279cddb1038..bb5821682d5 100644
--- a/source/blender/src/buttons_scene.c
+++ b/source/blender/src/buttons_scene.c
@@ -1042,12 +1042,12 @@ static void render_panel_output(void)
/* Toon shading buttons */
uiBlockBeginAlign(block);
uiDefButI(block, TOG|BIT|5, 0,"Edge", 155, 94, 44, 20, &G.scene->r.mode, 0, 0, 0, 0, "Enable Toon shading");
- uiDefBlockBut(block, edge_render_menu, NULL, "Edge Settings |>> ", 200, 94, 110, 20, "Display edge settings");
+ uiDefBlockBut(block, edge_render_menu, NULL, "Edge Settings", 200, 94, 110, 20, "Display edge settings");
uiBlockEndAlign(block);
/* unified render buttons */
if(G.scene->r.mode & R_UNIFIED) {
- uiDefBlockBut(block, post_render_menu, NULL, "Post process |>> ", 200, 68, 110, 20, "Only for unified render");
+ uiDefBlockBut(block, post_render_menu, NULL, "Post process", 200, 68, 110, 20, "Only for unified render");
if (G.scene->r.mode & R_GAMMA) {
uiDefButF(block, NUMSLI, 0,"Gamma:", 10, 68, 142, 20,
&(G.scene->r.gamma), 0.2, 5.0, B_GAMMASLI, 0,
@@ -1165,7 +1165,7 @@ static void render_panel_format(void)
block= uiNewBlock(&curarea->uiblocks, "render_panel_format", UI_EMBOSS, UI_HELV, curarea->win);
if(uiNewPanel(curarea, block, "Format", "Render", 960, 0, 318, 204)==0) return;
uiDefBlockBut(block, framing_render_menu, NULL,
- "Game framing settings |>> ",
+ "Game framing settings",
892, 169, 227, 20, "Display game framing settings");
/* uiDefIconTextBlockBut(block, framing_render_menu, NULL,
ICON_BLOCKBUT_CORNER,
@@ -1221,7 +1221,7 @@ static void render_panel_format(void)
}
yofs -= 22;
- uiDefBlockBut(block, qtcodec_menu, NULL, "Codec Settings |>> ", 892,yofs, 227, 20, "Edit Codec settings for QuickTime");
+ uiDefBlockBut(block, qtcodec_menu, NULL, "Codec Settings", 892,yofs, 227, 20, "Edit Codec settings for QuickTime");
yofs +=22;
#endif /* libquicktime */
diff --git a/source/blender/src/header_action.c b/source/blender/src/header_action.c
index f025c698f98..ba65c029362 100644
--- a/source/blender/src/header_action.c
+++ b/source/blender/src/header_action.c
@@ -138,8 +138,8 @@ void do_action_buttons(unsigned short event)
G.v2d->cur.ymin=-SCROLLB;
if (!G.saction->action){ // here the mesh rvk?
- G.v2d->cur.xmax=0;
- G.v2d->cur.xmax=100;
+ G.v2d->cur.xmax= -5;
+ G.v2d->cur.xmax= 100;
}
else {
float extra;
@@ -148,6 +148,11 @@ void do_action_buttons(unsigned short event)
extra= 0.05*(G.v2d->cur.xmax - G.v2d->cur.xmin);
G.v2d->cur.xmin-= extra;
G.v2d->cur.xmax+= extra;
+
+ if(G.v2d->cur.xmin==G.v2d->cur.xmax) {
+ G.v2d->cur.xmax= -5;
+ G.v2d->cur.xmax= 100;
+ }
}
G.v2d->tot= G.v2d->cur;