diff options
author | Matt Ebb <matt@mke3.net> | 2004-07-21 05:44:27 +0400 |
---|---|---|
committer | Matt Ebb <matt@mke3.net> | 2004-07-21 05:44:27 +0400 |
commit | df36d4c8e5ac74a15ceafaa93ad1b62c98a8f9fc (patch) | |
tree | 0536d3adf2adad3f09e319f04db6835107f02016 | |
parent | 73b700626b3b44d41975b1858ca144abd8c9aabc (diff) |
More details:
* Added 'Crease SubSurf' to the menus/toolbox
* Language edits in the sequence editor
-rw-r--r-- | source/blender/src/drawseq.c | 30 | ||||
-rw-r--r-- | source/blender/src/header_view3d.c | 10 | ||||
-rw-r--r-- | source/blender/src/toolbox.c | 2 |
3 files changed, 27 insertions, 15 deletions
diff --git a/source/blender/src/drawseq.c b/source/blender/src/drawseq.c index 0e0645a85dc..73d95d78a6d 100644 --- a/source/blender/src/drawseq.c +++ b/source/blender/src/drawseq.c @@ -644,7 +644,7 @@ static void seq_panel_properties(short cntrl) // SEQ_HANDLER_PROPERTIES block= uiNewBlock(&curarea->uiblocks, "seq_panel_properties", UI_EMBOSS, UI_HELV, curarea->win); uiPanelControl(UI_PNL_SOLID | UI_PNL_CLOSE | cntrl); uiSetPanelHandler(SEQ_HANDLER_PROPERTIES); // for close and esc - if(uiNewPanel(curarea, block, "Transform Properties", "Seq", 10, 230, 318, 204)==0) return; + if(uiNewPanel(curarea, block, "Strip Properties", "Seq", 10, 230, 318, 204)==0) return; if(last_seq==NULL) return; @@ -653,7 +653,7 @@ static void seq_panel_properties(short cntrl) // SEQ_HANDLER_PROPERTIES VarStruct *varstr; int a, xco, yco; - uiDefBut(block, LABEL, 0, "Striptype: Plugin", 10,50,70,20, 0, 0, 0, 0, 0, ""); + uiDefBut(block, LABEL, 0, "Type: Plugin", 10,50,70,20, 0, 0, 0, 0, 0, ""); pis= last_seq->plugin; if(pis->vars==0) return; @@ -670,28 +670,28 @@ static void seq_panel_properties(short cntrl) // SEQ_HANDLER_PROPERTIES } else if(last_seq->type==SEQ_IMAGE) { - uiDefBut(block, LABEL, 0, "Striptype: Image", 10,140,150,20, 0, 0, 0, 0, 0, ""); - uiDefBut(block, TEX, 0, "Stripname: ", 10,120,150,19, last_seq->name+2, 0.0, 21.0, 100, 0, ""); + uiDefBut(block, LABEL, 0, "Type: Image", 10,140,150,20, 0, 0, 0, 0, 0, ""); + uiDefBut(block, TEX, 0, "Name: ", 10,120,150,19, last_seq->name+2, 0.0, 21.0, 100, 0, ""); } else if(last_seq->type==SEQ_META) { - uiDefBut(block, LABEL, 0, "Striptype: Meta", 10,140,150,20, 0, 0, 0, 0, 0, ""); - uiDefBut(block, TEX, 0, "Stripname: ", 10,120,150,19, last_seq->name+2, 0.0, 21.0, 100, 0, ""); + uiDefBut(block, LABEL, 0, "Type: Meta", 10,140,150,20, 0, 0, 0, 0, 0, ""); + uiDefBut(block, TEX, 0, "Name: ", 10,120,150,19, last_seq->name+2, 0.0, 21.0, 100, 0, ""); } else if(last_seq->type==SEQ_SCENE) { - uiDefBut(block, LABEL, 0, "Striptype: Scene", 10,140,150,20, 0, 0, 0, 0, 0, ""); - uiDefBut(block, TEX, 0, "Stripname: ", 10,120,150,19, last_seq->name+2, 0.0, 21.0, 100, 0, ""); + uiDefBut(block, LABEL, 0, "Type: Scene", 10,140,150,20, 0, 0, 0, 0, 0, ""); + uiDefBut(block, TEX, 0, "Name: ", 10,120,150,19, last_seq->name+2, 0.0, 21.0, 100, 0, ""); } else if(last_seq->type==SEQ_MOVIE) { if(last_seq->mul==0.0) last_seq->mul= 1.0; - uiDefBut(block, LABEL, 0, "Striptype: Movie", 10,140,150,20, 0, 0, 0, 0, 0, ""); - uiDefBut(block, TEX, 0, "Stripname: ", 10,120,150,19, last_seq->name+2, 0.0, 21.0, 100, 0, ""); + uiDefBut(block, LABEL, 0, "Type: Movie", 10,140,150,20, 0, 0, 0, 0, 0, ""); + uiDefBut(block, TEX, 0, "Name: ", 10,120,150,19, last_seq->name+2, 0.0, 21.0, 100, 0, ""); uiDefButS(block, TOG|BIT|4, SEQ_BUT_MOVIE, "FilterY ", 10,90,150,19, &last_seq->flag, 0.0, 21.0, 100, 0, ""); uiDefButF(block, NUM, SEQ_BUT_MOVIE, "Mul:", 10,70,150,19, &last_seq->mul, 0.001, 5.0, 100, 0, ""); @@ -699,21 +699,21 @@ static void seq_panel_properties(short cntrl) // SEQ_HANDLER_PROPERTIES } else if(last_seq->type==SEQ_SOUND) { - uiDefBut(block, LABEL, 0, "Striptype: Audio", 10,140,150,20, 0, 0, 0, 0, 0, ""); - uiDefBut(block, TEX, 0, "Stripname: ", 10,120,150,19, last_seq->name+2, 0.0, 21.0, 100, 0, ""); + uiDefBut(block, LABEL, 0, "Type: Audio", 10,140,150,20, 0, 0, 0, 0, 0, ""); + uiDefBut(block, TEX, 0, "Name: ", 10,120,150,19, last_seq->name+2, 0.0, 21.0, 100, 0, ""); uiDefButS(block, TOG|BIT|5, 0, "Mute", 10,90,120,19, &last_seq->flag, 0.0, 21.0, 100, 0, ""); uiDefButF(block, NUM, SEQ_BUT_MOVIE, "Gain (dB):", 10,70,150,19, &last_seq->level, -96.0, 6.0, 100, 0, ""); uiDefButF(block, NUM, SEQ_BUT_MOVIE, "Pan:", 10,50,150,19, &last_seq->pan, -1.0, 1.0, 100, 0, ""); } else if(last_seq->type>=SEQ_EFFECT) { - uiDefBut(block, LABEL, 0, "Striptype: Effect", 10,140,150,20, 0, 0, 0, 0, 0, ""); - uiDefBut(block, TEX, 0, "Stripname: ", 10,120,150,19, last_seq->name+2, 0.0, 21.0, 100, 0, ""); + uiDefBut(block, LABEL, 0, "Type: Effect", 10,140,150,20, 0, 0, 0, 0, 0, ""); + uiDefBut(block, TEX, 0, "Name: ", 10,120,150,19, last_seq->name+2, 0.0, 21.0, 100, 0, ""); if(last_seq->type==SEQ_SWEEP){ SweepVars *sweep = (SweepVars *)last_seq->effectdata; char formatstring[1024]; - strcpy(formatstring, "Select Sweep Type %t|Single Wipe%x0|Double Wipe %x1|Iris Wipe %x4|Clock Wipe %x5"); + strcpy(formatstring, "Transition Type %t|Single Wipe%x0|Double Wipe %x1|Iris Wipe %x4|Clock Wipe %x5"); uiDefButS(block, MENU,SEQ_BUT_EFFECT | B_NOP, formatstring, 10,90,220,22, &sweep->sweeptype, 0, 0, 0, 0, "What type of sweep should be performed"); uiDefButF(block, NUM,SEQ_BUT_EFFECT| B_NOP,"Blur:", 10,65,220,22, &sweep->edgeWidth,0.0,1.0, 1, 2, "The percent width of the blur edge"); switch(sweep->sweeptype){ /*Skip Types that do not require angle*/ diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c index 68f33253fa6..15837b77789 100644 --- a/source/blender/src/header_view3d.c +++ b/source/blender/src/header_view3d.c @@ -1944,6 +1944,9 @@ void do_view3d_edit_mesh_edgesmenu(void *arg, int event) case 8: /* Clear Seam */ editmesh_mark_seam(1); break; + case 9: /* Cease SubSurf */ + transform('e'); + break; } allqueue(REDRAWVIEW3D, 0); } @@ -1952,6 +1955,8 @@ static uiBlock *view3d_edit_mesh_edgesmenu(void *arg_unused) { uiBlock *block; short yco = 20, menuwidth = 120; + + Mesh *me= get_mesh(OBACT); block= uiNewBlock(&curarea->uiblocks, "view3d_edit_mesh_edgesmenu", UI_EMBOSSP, UI_HELV, G.curscreen->mainwin); uiBlockSetButmFunc(block, do_view3d_edit_mesh_edgesmenu, NULL); @@ -1975,6 +1980,11 @@ static uiBlock *view3d_edit_mesh_edgesmenu(void *arg_unused) uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Mark Seam|Ctrl E", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 7, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Clear Seam|Ctrl E", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 8, ""); + if (me->flag & ME_SUBSURF) { + uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Crease SubSurf|Shift E", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 9, ""); + } + uiBlockSetDirection(block, UI_RIGHT); uiTextBoundsBlock(block, 60); return block; diff --git a/source/blender/src/toolbox.c b/source/blender/src/toolbox.c index 188499378af..02f2dc680b2 100644 --- a/source/blender/src/toolbox.c +++ b/source/blender/src/toolbox.c @@ -1715,6 +1715,8 @@ static TBitem tb_mesh_edit_edge[]= { { 0, "SEPR", 0, NULL}, { 0, "Mark Seam|Ctrl E", 7, NULL}, { 0, "Clear Seam|Ctrl E", 8, NULL}, +{ 0, "SEPR", 0, NULL}, +{ 0, "Crease SubSurf|Shift E", 9, NULL}, { -1, "", 0, do_view3d_edit_mesh_edgesmenu}}; static TBitem tb_mesh_edit_face[]= { |