griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

2.5:

Browse Source 
* Removed some more old sculpt layout code.

* Fixed Channel hack in sequencer. This is now fixed in layout engine.
This commit is contained in:
Thomas Dinges
2009-08-16 14:38:59 +00:00
parent bbf24a2243
commit 406d009269
2 changed files with 1 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/ui/space_sequencer.py
View File

@@ -31,7 +31,7 @@ class SEQUENCER_HT_header(bpy.types.Header):
layout.itemS()
row.itemO("sequencer.reload")
else:
row.itemR(st, "display_channel", text=" Channel") #XXX Ugly, should be fixed in Layout Engine itself.
row.itemR(st, "display_channel", text="Channel")
class SEQUENCER_MT_view(bpy.types.Menu):
__space_type__ = "SEQUENCE_EDITOR"

94
source/blender/editors/space_view3d/view3d_header.c
View File

@@ -2839,100 +2839,6 @@ static uiBlock *view3d_wpaintmenu(bContext *C, ARegion *ar, void *arg_unused)
return block;
}
void do_view3d_sculpt_inputmenu(bContext *C, void *arg, int event)
{
#if 0
Scene *scene= CTX_data_scene(C);
SculptData *sd= &scene->sculptdata;
short val;
switch(event) {
case 0:
sd->flags ^= SCULPT_INPUT_SMOOTH;
ED_undo_push(C, "Smooth stroke");
break;
case 1:
val= sd->tablet_size;
if(button(&val,0,10,"Tablet Size:")==0) return;
sd->tablet_size= val;
ED_undo_push(C, "Tablet size");
break;
case 2:
val= sd->tablet_strength;
if(button(&val,0,10,"Tablet Strength:")==0) return;
sd->tablet_strength= val;
ED_undo_push(C, "Tablet strength");
break;
}
#endif
}
void do_view3d_sculptmenu(bContext *C, void *arg, int event)
{
#if 0
Scene *scene= CTX_data_scene(C);
ScrArea *sa= CTX_wm_area(C);
View3D *v3d= sa->spacedata.first;
SculptData *sd= &scene->sculptdata;
BrushData *br= sculptmode_brush();
switch(event) {
case 0:
case 1:
case 2:
case 3:
case 4:
case 5:
case 6:
sd->brush_type= event+1;
ED_undo_push(C, "Brush type");
break;
case 11:
if(v3d)
v3d->pivot_last= !v3d->pivot_last;
break;
case 12:
sd->flags ^= SCULPT_DRAW_FAST;
ED_undo_push(C, "Partial Redraw");
break;
case 13:
sd->flags ^= SCULPT_DRAW_BRUSH;
ED_undo_push(C, "Draw Brush");
break;
case 14:
add_blockhandler(sa, VIEW3D_HANDLER_OBJECT, UI_PNL_UNSTOW);
break;
case 15:
sculpt_radialcontrol_start(RADIALCONTROL_ROTATION);
break;
case 16:
sculpt_radialcontrol_start(RADIALCONTROL_STRENGTH);
break;
case 17:
sculpt_radialcontrol_start(RADIALCONTROL_SIZE);
break;
#endif
}
uiBlock *view3d_sculpt_inputmenu(bContext *C, ARegion *ar, void *arg_unused)
{
uiBlock *block;
short yco= 0, menuwidth= 120;
Sculpt *sd= CTX_data_tool_settings(C)->sculpt;
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, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Tablet Size Adjust", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Tablet Strength Adjust", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
uiBlockSetDirection(block, UI_RIGHT);
uiTextBoundsBlock(block, 50);
return block;
}
static void do_view3d_facesel_showhidemenu(bContext *C, void *arg, int event)
{
#if 0