bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Added (but recoded) patch submitted by Chris Burt to have render window

Browse Source 
opened in size of actual border, if option "Crop" is set.
This commit is contained in:
Ton Roosendaal 2005-02-12 15:41:07 +00:00
parent 43310097c9
commit b7d5f62e04
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/src/renderwin.c
View File

@ -237,10 +237,16 @@ static void renderwin_reset_view(RenderWin *rw)
window_get_size(rw->win, &w, &h);
h-= RW_HEADERY;
/* at this point the r.rectx/y values are not correct yet */
/* at this point the r.rectx/y values are not correct yet */
rectx= (G.scene->r.size*G.scene->r.xsch)/100;
recty= (G.scene->r.size*G.scene->r.ysch)/100;
/* crop option makes image smaller */
if ((G.scene->r.mode & R_BORDER) && (G.scene->r.mode & R_MOVIECROP)) {
rectx*= (G.scene->r.border.xmax-G.scene->r.border.xmin);
recty*= (G.scene->r.border.ymax-G.scene->r.border.ymin);
}
if(rectx>w || recty>h) {
if(rectx-w > recty-h) rw->zoom= ((float)w)/((float)rectx);
else rw->zoom= ((float)h)/((float)recty);
@ -589,6 +595,13 @@ void calc_renderwin_rectangle(int posmask, int renderpos_r[2], int rendersize_r[
rendersize_r[0]= (G.scene->r.size*G.scene->r.xsch)/100;
rendersize_r[1]= (G.scene->r.size*G.scene->r.ysch)/100;
/* crop option makes image smaller */
if ((G.scene->r.mode & R_BORDER) && (G.scene->r.mode & R_MOVIECROP)) {
rendersize_r[0]*= (G.scene->r.border.xmax-G.scene->r.border.xmin);
rendersize_r[1]*= (G.scene->r.border.ymax-G.scene->r.border.ymin);
}
if(G.scene->r.mode & R_PANORAMA) {
rendersize_r[0]*= G.scene->r.xparts;
rendersize_r[1]*= G.scene->r.yparts;