Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-06-24 12:23:33 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-06-24 12:23:33 +0400
commit4f0e42489f9d8bb0bc8de005e811cef630458bf5 (patch)
treee18c0f2929d42ed5ab749b3b6f3553996a0191ff /source/blender/editors/render
parentcc0c94d535e4c0ee322876f6e6c7bd271f5316fa (diff)
Followup for the previous commit
Need to do the same for render exec() because it doesn't use the job system.
Diffstat (limited to 'source/blender/editors/render')
-rw-r--r--source/blender/editors/render/render_internal.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index eaaed0fd453..19290ef0f48 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);