|
|
|
@@ -229,6 +229,7 @@ static uiBlock *view3d_view_cameracontrolsmenu(void *arg_unused)
|
|
|
|
static void do_view3d_viewmenu(void *arg, int event)
|
|
|
|
static void do_view3d_viewmenu(void *arg, int event)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
extern int play_anim(int mode);
|
|
|
|
extern int play_anim(int mode);
|
|
|
|
|
|
|
|
void setcameratoview3d(void); // view.c
|
|
|
|
|
|
|
|
|
|
|
|
float *curs;
|
|
|
|
float *curs;
|
|
|
|
|
|
|
|
|
|
|
|
@@ -282,10 +283,18 @@ static void do_view3d_viewmenu(void *arg, int event)
|
|
|
|
case 13: /* Play Back Animation */
|
|
|
|
case 13: /* Play Back Animation */
|
|
|
|
play_anim(0);
|
|
|
|
play_anim(0);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case 14: /* Backdrop Panel */
|
|
|
|
case 14: /* Align Active Camera to View */
|
|
|
|
|
|
|
|
/* This ugly hack is a symptom of the nasty persptoetsen function,
|
|
|
|
|
|
|
|
* but at least it works for now.
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
G.qual |= LR_SHIFTKEY;
|
|
|
|
|
|
|
|
persptoetsen(PAD0);
|
|
|
|
|
|
|
|
G.qual &= ~LR_SHIFTKEY;
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 15: /* Background Image... */
|
|
|
|
add_blockhandler(curarea, VIEW3D_HANDLER_BACKGROUND, UI_PNL_UNSTOW);
|
|
|
|
add_blockhandler(curarea, VIEW3D_HANDLER_BACKGROUND, UI_PNL_UNSTOW);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case 15: /* View Panel */
|
|
|
|
case 16: /* View Panel */
|
|
|
|
add_blockhandler(curarea, VIEW3D_HANDLER_PROPERTIES, UI_PNL_UNSTOW);
|
|
|
|
add_blockhandler(curarea, VIEW3D_HANDLER_PROPERTIES, UI_PNL_UNSTOW);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@@ -301,8 +310,8 @@ static uiBlock *view3d_viewmenu(void *arg_unused)
|
|
|
|
block= uiNewBlock(&curarea->uiblocks, "view3d_viewmenu", UI_EMBOSSP, UI_HELV, curarea->headwin);
|
|
|
|
block= uiNewBlock(&curarea->uiblocks, "view3d_viewmenu", UI_EMBOSSP, UI_HELV, curarea->headwin);
|
|
|
|
uiBlockSetButmFunc(block, do_view3d_viewmenu, NULL);
|
|
|
|
uiBlockSetButmFunc(block, do_view3d_viewmenu, NULL);
|
|
|
|
|
|
|
|
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "View Properties...", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 15, "");
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "View Properties...", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 16, "");
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "Background Image...", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 14, "");
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "Background Image...", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 15, "");
|
|
|
|
if(!curarea->full) uiDefIconTextBut(block, BUTM, B_FULL, ICON_BLANK1, "Maximize Window|Ctrl UpArrow", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 99, "");
|
|
|
|
if(!curarea->full) uiDefIconTextBut(block, BUTM, B_FULL, ICON_BLANK1, "Maximize Window|Ctrl UpArrow", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 99, "");
|
|
|
|
else uiDefIconTextBut(block, BUTM, B_FULL, ICON_BLANK1, "Tile Window|Ctrl DownArrow", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 99, "");
|
|
|
|
else uiDefIconTextBut(block, BUTM, B_FULL, ICON_BLANK1, "Tile Window|Ctrl DownArrow", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 99, "");
|
|
|
|
|
|
|
|
|
|
|
|
@@ -335,19 +344,22 @@ static uiBlock *view3d_viewmenu(void *arg_unused)
|
|
|
|
|
|
|
|
|
|
|
|
uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
|
|
|
|
uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
|
|
|
|
|
|
|
|
|
|
|
|
uiDefIconTextBlockBut(block, view3d_view_cameracontrolsmenu, NULL, ICON_RIGHTARROW_THIN, "Viewport Navigation", 0, yco-=20, 120, 19, "");
|
|
|
|
uiDefIconTextBlockBut(block, view3d_view_cameracontrolsmenu, NULL, ICON_RIGHTARROW_THIN, "View Navigation", 0, yco-=20, 120, 19, "");
|
|
|
|
|
|
|
|
|
|
|
|
uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
|
|
|
|
uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
|
|
|
|
|
|
|
|
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Frame All|Home", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 9, "");
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Frame All|Home", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 9, "");
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Frame Selected|NumPad .", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 11, "");
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Frame Selected|NumPad .", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 11, "");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
|
|
|
|
|
|
|
|
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Align View to Selected|NumPad *", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 12, "");
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Align View to Selected|NumPad *", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 12, "");
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Centre Cursor|C", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 10, "");
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Align Active Camera to View|Shift NumPad 0", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 14, "");
|
|
|
|
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Centre View to Cursor|C", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 10, "");
|
|
|
|
|
|
|
|
|
|
|
|
uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
|
|
|
|
uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
|
|
|
|
|
|
|
|
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Play Back Animation|Alt A", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 13, "");
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Play Back Animation|Alt A", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 13, "");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(curarea->headertype==HEADERTOP) {
|
|
|
|
if(curarea->headertype==HEADERTOP) {
|
|
|
|
uiBlockSetDirection(block, UI_DOWN);
|
|
|
|
uiBlockSetDirection(block, UI_DOWN);
|
|
|
|
@@ -578,7 +590,7 @@ void do_view3d_select_meshmenu(void *arg, int event)
|
|
|
|
selectconnected_mesh(LR_CTRLKEY);
|
|
|
|
selectconnected_mesh(LR_CTRLKEY);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case 5: /* select random */
|
|
|
|
case 5: /* select random */
|
|
|
|
// selectrandom_mesh();
|
|
|
|
selectrandom_mesh();
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case 6: /* select Faceloop */
|
|
|
|
case 6: /* select Faceloop */
|
|
|
|
loop('s');
|
|
|
|
loop('s');
|
|
|
|
@@ -612,6 +624,14 @@ static uiBlock *view3d_select_meshmenu(void *arg_unused)
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Select/Deselect All|A", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Select/Deselect All|A", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Inverse", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Inverse", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
uiDefBut(block, SEPR, 0, "", 0, yco-=6,
|
|
|
|
|
|
|
|
menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Random...", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 5, "");
|
|
|
|
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1,
|
|
|
|
|
|
|
|
"Non-Manifold|Ctrl Alt Shift M",
|
|
|
|
|
|
|
|
0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 9, "");
|
|
|
|
|
|
|
|
|
|
|
|
uiDefBut(block, SEPR, 0, "", 0, yco-=6,
|
|
|
|
uiDefBut(block, SEPR, 0, "", 0, yco-=6,
|
|
|
|
menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
|
|
|
|
menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
|
|
|
|
|
|
|
|
|
|
|
|
@@ -619,15 +639,11 @@ static uiBlock *view3d_select_meshmenu(void *arg_unused)
|
|
|
|
0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 7, "");
|
|
|
|
0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 7, "");
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Less|Ctrl NumPad -",
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Less|Ctrl NumPad -",
|
|
|
|
0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 8, "");
|
|
|
|
0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 8, "");
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1,
|
|
|
|
|
|
|
|
"Non-manifold|Shift Ctrl Alt M",
|
|
|
|
|
|
|
|
0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 9, "");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
uiDefBut(block, SEPR, 0, "", 0, yco-=6,
|
|
|
|
uiDefBut(block, SEPR, 0, "", 0, yco-=6,
|
|
|
|
menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
|
|
|
|
menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
|
|
|
|
|
|
|
|
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Faceloop|Shift R", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 6, "");
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Face Loop...|Shift R", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 6, "");
|
|
|
|
// uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Random Vertices...", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 5, "");
|
|
|
|
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Linked Vertices|Ctrl L", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, "");
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Linked Vertices|Ctrl L", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, "");
|
|
|
|
|
|
|
|
|
|
|
|
if(curarea->headertype==HEADERTOP) {
|
|
|
|
if(curarea->headertype==HEADERTOP) {
|
|
|
|
@@ -2234,15 +2250,15 @@ static uiBlock *view3d_pose_armaturemenu(void *arg_unused)
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "Transform Properties|N", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "Transform Properties|N", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
|
|
|
|
uiDefIconTextBlockBut(block, view3d_pose_armature_transformmenu, NULL, ICON_RIGHTARROW_THIN, "Transform", 0, yco-=20, 120, 19, "");
|
|
|
|
uiDefIconTextBlockBut(block, view3d_pose_armature_transformmenu, NULL, ICON_RIGHTARROW_THIN, "Transform", 0, yco-=20, 120, 19, "");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Insert Keyframe|I", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, "");
|
|
|
|
|
|
|
|
|
|
|
|
uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
|
|
|
|
uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
|
|
|
|
|
|
|
|
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Copy Current Pose", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Copy Current Pose", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Paste Pose", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Paste Pose", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Paste Flipped Pose", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Paste Flipped Pose", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
|
|
|
|
|
|
|
|
|
|
|
|
uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Insert Keyframe|I", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, "");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
uiDefBut(block, SEPR, 0, "", 0, yco-=6,
|
|
|
|
uiDefBut(block, SEPR, 0, "", 0, yco-=6,
|
|
|
|
menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
|
|
|
|
menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
|
|
|
|
|