[Bf-blender-cvs] [4f0e424] master: Followup for the previous commit

[Sergey Sharybin]

Commit: 4f0e42489f9d8bb0bc8de005e811cef630458bf5
Author: Sergey Sharybin
Date:   Tue Jun 24 14:23:33 2014 +0600
https://developer.blender.org/rB4f0e42489f9d8bb0bc8de005e811cef630458bf5

Followup for the previous commit

Need to do the same for render exec() because it doesn't
use the job system.

===================================================================

M       source/blender/editors/render/render_internal.c

===================================================================

diff --git a/source/blender/editors/render/render_internal.c 
b/source/blender/editors/render/render_internal.c
index eaaed0f..19290ef 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -35,6 +35,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_threads.h"
 #include "BLI_utildefines.h"
 
 #include "PIL_time.h"
@@ -316,10 +317,12 @@ static int screen_render_exec(bContext *C, wmOperator *op)
 
        RE_SetReports(re, op->reports);
 
+       BLI_begin_threaded_malloc();
        if (is_animation)
                RE_BlenderAnim(re, mainp, scene, camera_override, lay_override, 
scene->r.sfra, scene->r.efra, scene->r.frame_step);
        else
                RE_BlenderFrame(re, mainp, scene, srl, camera_override, 
lay_override, scene->r.cfra, is_write_still);
+       BLI_end_threaded_malloc();
 
        RE_SetReports(re, NULL);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs