archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

fix for use of uninitialized memory with opengl render.

Browse Source
This commit is contained in:
Campbell Barton
2010-07-01 11:58:48 +00:00
parent 3a47839a31
commit 7c859b305f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/render/render_opengl.c
View File

@@ -233,7 +233,7 @@ static int screen_opengl_render_init(bContext *C, wmOperator *op)
rr= RE_AcquireResultWrite(oglrender->re);
if(rr->rectf==NULL)
rr->rectf= MEM_mallocN(sizeof(float)*4*sizex*sizey, "32 bits rects");
rr->rectf= MEM_callocN(sizeof(float)*4*sizex*sizey, "screen_opengl_render_init rect");
RE_ReleaseResult(oglrender->re);
return 1;
@@ -402,9 +402,10 @@ static int screen_opengl_render_modal(bContext *C, wmOperator *op, wmEvent *even
return OPERATOR_RUNNING_MODAL;
}
ret= screen_opengl_render_anim_step(C, op);
/* run first because screen_opengl_render_anim_step can free oglrender */
WM_event_add_notifier(C, NC_SCENE|ND_RENDER_RESULT, oglrender->scene);
ret= screen_opengl_render_anim_step(C, op);
/* stop at the end or on error */
if(ret == 0) {