[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29844] trunk/blender/source/blender/ editors/render/render_opengl.c: fix for use of uninitialized memory with opengl render.
Campbell Barton
ideasman42 at gmail.com
Thu Jul 1 13:58:49 CEST 2010
Revision: 29844
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29844
Author: campbellbarton
Date: 2010-07-01 13:58:48 +0200 (Thu, 01 Jul 2010)
Log Message:
-----------
fix for use of uninitialized memory with opengl render.
Modified Paths:
--------------
trunk/blender/source/blender/editors/render/render_opengl.c
Modified: trunk/blender/source/blender/editors/render/render_opengl.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_opengl.c 2010-07-01 11:37:51 UTC (rev 29843)
+++ trunk/blender/source/blender/editors/render/render_opengl.c 2010-07-01 11:58:48 UTC (rev 29844)
@@ -233,7 +233,7 @@
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,10 +402,11 @@
return OPERATOR_RUNNING_MODAL;
}
+ /* 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);
- WM_event_add_notifier(C, NC_SCENE|ND_RENDER_RESULT, oglrender->scene);
-
/* stop at the end or on error */
if(ret == 0) {
return OPERATOR_FINISHED;
More information about the Bf-blender-cvs
mailing list