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

Bug + patch #4655

Browse Source 
- Added "Shift+P" note in 3d window menu for preview panel
- Added Preview, passepartout in spacebar toolbox
- Info pulldown "Render" -> "Render buttons" did cycle, should not.
This commit is contained in:
Ton Roosendaal
2006-07-11 09:07:19 +00:00
parent a8ad9880f4
commit d941fd7d6e
3 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/src/header_info.c
View File

@@ -1575,7 +1575,7 @@ static void do_info_rendermenu(void *arg, int event)
break;
case 7:
extern_set_butspace(F10KEY, 1);
extern_set_butspace(F10KEY, 0);
break;
}
allqueue(REDRAWINFO, 0);

2
source/blender/src/header_view3d.c
View File

@@ -504,7 +504,7 @@ static uiBlock *view3d_viewmenu(void *arg_unused)
block= uiNewBlock(&curarea->uiblocks, "view3d_viewmenu", UI_EMBOSSP, UI_HELV, curarea->headwin);
uiBlockSetButmFunc(block, do_view3d_viewmenu, NULL);
uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "Render Preview...", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 18, "");
uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "Render Preview...|Shift P", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 18, "");
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, 15, "");

27
source/blender/src/toolbox.c
View File

@@ -66,6 +66,7 @@
#include "DNA_scene_types.h"
#include "DNA_userdef_types.h"
#include "DNA_view3d_types.h"
#include "DNA_camera_types.h"
#include "BLI_blenlib.h"
#include "BLI_arithb.h"
@@ -1465,20 +1466,34 @@ static void tb_do_render(void *arg, int event){
case 3: /* render anim */
BIF_do_render(1);
break;
case 4: /* render anim */
if(G.scene->r.scemode & R_PASSEPARTOUT) G.scene->r.scemode &= ~R_PASSEPARTOUT;
else G.scene->r.scemode |= R_PASSEPARTOUT;
case 4: /* passepartout */
if(G.vd->camera==NULL) return;
Camera *ca= NULL;
if(G.vd->camera->type==OB_CAMERA)
ca= G.vd->camera->data;
else return;
if (ca && (ca->flag & CAM_SHOWPASSEPARTOUT))
ca->flag &= ~CAM_SHOWPASSEPARTOUT;
else
ca->flag |= CAM_SHOWPASSEPARTOUT;
allqueue(REDRAWVIEW3D, 0);
break;
case 5: /*preview render */
toggle_blockhandler(curarea, VIEW3D_HANDLER_PREVIEW, 0);
scrarea_queue_winredraw(curarea);
break;
}
}
static TBitem tb_render[]= {
{ 0, "Passepartout", 4, NULL},
{ 0, "Set Border", 1, NULL},
{ 0, "SEPR", 0, NULL},
{ 0, "Set Border|Shift B", 1, NULL},
{ 0, "SEPR", 0, NULL},
{ 0, "Render|F12", 2, NULL},
{ 0, "Anim", 3, NULL},
{ 0, "Anim|Ctrl F12", 3, NULL},
{ 0, "Preview|Shift P", 5, NULL},
{ -1, "", 0, tb_do_render}};
/* ************************* NODES *********************** */