kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix for tracker report on crashing border render in unified render.

Browse Source 
it is related to the fix for 2.31, wich disabled hackish feature of
 inserting the previous render outside border. i forgot the unified has
 this code entirely duplicated, something to get rid of one day...
This commit is contained in:
Ton Roosendaal 2004-01-14 14:30:59 +00:00
parent d7bac993fa
commit 3e84e66078
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/render/intern/source/outerRenderLoop.c
View File

@ -245,18 +245,7 @@ void unifiedRenderingLoop(void) /* here the PART en FIELD loops */
unsigned int *rt, *rt1, *rt2; unsigned int *rt, *rt1, *rt2;
int len; int len;
short blur, a,fields,fi,parts; /* pa is global because of print */ short blur, a,fields,fi,parts; /* pa is global because of print */
unsigned int *border_buf= NULL;
unsigned int border_x= 0;
unsigned int border_y= 0;
if((R.r.mode & R_BORDER) && !(R.r.mode & R_MOVIECROP)) {
border_buf= R.rectot;
border_x= R.rectx;
border_y= R.recty;
R.rectot= 0;
}
if (R.rectz) MEM_freeN(R.rectz); if (R.rectz) MEM_freeN(R.rectz);
R.rectz = 0; R.rectz = 0;
@ -372,13 +361,8 @@ void unifiedRenderingLoop(void) /* here the PART en FIELD loops */
if(parts>1 || (R.r.mode & R_BORDER)) { if(parts>1 || (R.r.mode & R_BORDER)) {
if(R.rectot) MEM_freeN(R.rectot); if(R.rectot) MEM_freeN(R.rectot);
if(R.r.mode & R_BORDER) {
if(border_x<R.rectx || border_y<R.recty || border_buf==NULL) R.rectot=(unsigned int *)MEM_mallocN(sizeof(int)*R.rectx*R.recty, "rectot");
R.rectot= (unsigned int *)MEM_callocN(sizeof(int)*R.rectx*R.recty, "rectot");
else
R.rectot= border_buf;
}
else R.rectot=(unsigned int *)MEM_mallocN(sizeof(int)*R.rectx*R.recty, "rectot");
part= R.parts.first; part= R.parts.first;
for(pa=0; pa<parts; pa++) { for(pa=0; pa<parts; pa++) {