forked from bartvdbraak/blender
A few more sculptmode hotkeys. NKey for the floating properties panel (also added menu item for that), pageup/pagedown for changing multires level, and alt+HKey for unhiding hidden areas of the sculptmesh.
This commit is contained in:
parent
76d96a0885
commit
0bc62f2742
@ -4038,6 +4038,9 @@ void do_view3d_sculptmenu(void *arg, int event)
|
|||||||
case 14:
|
case 14:
|
||||||
sd->draw_mode= !sd->draw_mode;
|
sd->draw_mode= !sd->draw_mode;
|
||||||
break;
|
break;
|
||||||
|
case 15:
|
||||||
|
add_blockhandler(curarea, VIEW3D_HANDLER_OBJECT, UI_PNL_UNSTOW);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
allqueue(REDRAWBUTSEDIT, 0);
|
allqueue(REDRAWBUTSEDIT, 0);
|
||||||
@ -4054,6 +4057,8 @@ uiBlock *view3d_sculptmenu(void *arg_unused_so_why_have_it/*?*/)
|
|||||||
block= uiNewBlock(&curarea->uiblocks, "view3d_sculptmenu", UI_EMBOSSP, UI_HELV, curarea->headwin);
|
block= uiNewBlock(&curarea->uiblocks, "view3d_sculptmenu", UI_EMBOSSP, UI_HELV, curarea->headwin);
|
||||||
uiBlockSetButmFunc(block, do_view3d_sculptmenu, NULL);
|
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, 15, "");
|
||||||
|
uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
|
||||||
uiDefIconTextBut(block, BUTM, 1, (sd->draw_mode ? ICON_CHECKBOX_HLT : ICON_CHECKBOX_DEHLT), "Partial Redraw", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 14, "");
|
uiDefIconTextBut(block, BUTM, 1, (sd->draw_mode ? ICON_CHECKBOX_HLT : ICON_CHECKBOX_DEHLT), "Partial Redraw", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 14, "");
|
||||||
if(G.vd)
|
if(G.vd)
|
||||||
uiDefIconTextBut(block, BUTM, 1, (G.vd->pivot_last ? ICON_CHECKBOX_HLT : ICON_CHECKBOX_DEHLT), "Pivot last", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 13, "");
|
uiDefIconTextBut(block, BUTM, 1, (G.vd->pivot_last ? ICON_CHECKBOX_HLT : ICON_CHECKBOX_DEHLT), "Pivot last", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 13, "");
|
||||||
|
@ -1197,6 +1197,7 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
|
|||||||
if(!G.obedit && (G.f & G_SCULPTMODE)) {
|
if(!G.obedit && (G.f & G_SCULPTMODE)) {
|
||||||
SculptData *sd= &G.scene->sculptdata;
|
SculptData *sd= &G.scene->sculptdata;
|
||||||
BrushData *br= sculptmode_brush();
|
BrushData *br= sculptmode_brush();
|
||||||
|
Mesh *me= get_mesh(sd->active_ob);
|
||||||
char update_prop= 0;
|
char update_prop= 0;
|
||||||
switch(event) {
|
switch(event) {
|
||||||
case LEFTMOUSE:
|
case LEFTMOUSE:
|
||||||
@ -1268,6 +1269,36 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
|
|||||||
case ZKEY:
|
case ZKEY:
|
||||||
sd->symm_z= !sd->symm_z;
|
sd->symm_z= !sd->symm_z;
|
||||||
update_prop= 1; break;
|
update_prop= 1; break;
|
||||||
|
/* Interface */
|
||||||
|
case NKEY:
|
||||||
|
if(G.qual==0) {
|
||||||
|
toggle_blockhandler(curarea, VIEW3D_HANDLER_OBJECT, UI_PNL_TO_MOUSE);
|
||||||
|
allqueue(REDRAWVIEW3D, 0);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
/* Multires */
|
||||||
|
case PAGEUPKEY:
|
||||||
|
if(me && me->mr) {
|
||||||
|
me->mr->newlvl= ((Mesh*)ob->data)->mr->current+1;
|
||||||
|
multires_set_level(ob,ob->data);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case PAGEDOWNKEY:
|
||||||
|
if(me && me->mr) {
|
||||||
|
me->mr->newlvl= ((Mesh*)ob->data)->mr->current-1;
|
||||||
|
multires_set_level(ob,ob->data);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
/* Partial Visibility */
|
||||||
|
case HKEY:
|
||||||
|
if(G.qual==LR_ALTKEY) {
|
||||||
|
waitcursor(1);
|
||||||
|
sculptmode_pmv_off(get_mesh(ob));
|
||||||
|
BIF_undo_push("Partial mesh hide");
|
||||||
|
allqueue(REDRAWVIEW3D,0);
|
||||||
|
waitcursor(0);
|
||||||
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Redraw buttons window as well as view 3d (for floating panel) */
|
/* Redraw buttons window as well as view 3d (for floating panel) */
|
||||||
@ -1694,15 +1725,6 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
|
|||||||
}
|
}
|
||||||
else if(G.f & G_FACESELECT)
|
else if(G.f & G_FACESELECT)
|
||||||
hide_tface();
|
hide_tface();
|
||||||
else if(G.f & G_SCULPTMODE) {
|
|
||||||
if(G.qual==LR_ALTKEY) {
|
|
||||||
waitcursor(1);
|
|
||||||
sculptmode_pmv_off(get_mesh(ob));
|
|
||||||
BIF_undo_push("Partial mesh hide");
|
|
||||||
allqueue(REDRAWVIEW3D,0);
|
|
||||||
waitcursor(0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if(ob && (ob->flag & OB_POSEMODE)) {
|
else if(ob && (ob->flag & OB_POSEMODE)) {
|
||||||
if (G.qual==0)
|
if (G.qual==0)
|
||||||
hide_selected_pose_bones();
|
hide_selected_pose_bones();
|
||||||
@ -2235,31 +2257,17 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case PAGEUPKEY:
|
case PAGEUPKEY:
|
||||||
if(G.f & G_SCULPTMODE) {
|
if(G.qual==LR_CTRLKEY)
|
||||||
if(ob && ob->type == OB_MESH && ((Mesh*)ob->data)->mr) {
|
movekey_obipo(1);
|
||||||
((Mesh*)ob->data)->mr->newlvl= ((Mesh*)ob->data)->mr->current+1;
|
else if((G.qual==0))
|
||||||
multires_set_level(ob,ob->data);
|
nextkey_obipo(1); /* in editipo.c */
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if(G.qual==LR_CTRLKEY)
|
|
||||||
movekey_obipo(1);
|
|
||||||
else if((G.qual==0))
|
|
||||||
nextkey_obipo(1); /* in editipo.c */
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PAGEDOWNKEY:
|
case PAGEDOWNKEY:
|
||||||
if(G.f & G_SCULPTMODE) {
|
if(G.qual==LR_CTRLKEY)
|
||||||
if(ob && ob->type == OB_MESH && ((Mesh*)ob->data)->mr) {
|
movekey_obipo(-1);
|
||||||
((Mesh*)ob->data)->mr->newlvl= ((Mesh*)ob->data)->mr->current-1;
|
else if((G.qual==0))
|
||||||
multires_set_level(ob,ob->data);
|
nextkey_obipo(-1);
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if(G.qual==LR_CTRLKEY)
|
|
||||||
movekey_obipo(-1);
|
|
||||||
else if((G.qual==0))
|
|
||||||
nextkey_obipo(-1);
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PAD0: case PAD1: case PAD2: case PAD3: case PAD4:
|
case PAD0: case PAD1: case PAD2: case PAD3: case PAD4:
|
||||||
|
Loading…
Reference in New Issue
Block a user