From 29e3b098253270d4c5cf8337ad068bf4e98d7bdb Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 20 Dec 2013 00:43:26 +0100 Subject: Fix T37890: compositor did not take number of thread setting into account. --- source/blender/compositor/intern/COM_compositor.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/compositor/intern/COM_compositor.cpp') diff --git a/source/blender/compositor/intern/COM_compositor.cpp b/source/blender/compositor/intern/COM_compositor.cpp index 6f3f0074f2e..e92d2a3d004 100644 --- a/source/blender/compositor/intern/COM_compositor.cpp +++ b/source/blender/compositor/intern/COM_compositor.cpp @@ -26,6 +26,7 @@ extern "C" { #include "BLI_threads.h" } #include "BKE_main.h" +#include "BKE_scene.h" #include "BKE_global.h" #include "COM_compositor.h" @@ -72,7 +73,7 @@ void COM_execute(RenderData *rd, bNodeTree *editingtree, int rendering, /* initialize workscheduler, will check if already done. TODO deinitialize somewhere */ bool use_opencl = (editingtree->flag & NTREE_COM_OPENCL) != 0; - WorkScheduler::initialize(use_opencl); + WorkScheduler::initialize(use_opencl, BKE_render_num_threads(rd)); /* set progress bar to 0% and status to init compositing */ editingtree->progress(editingtree->prh, 0.0); -- cgit v1.2.3