diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-12-20 03:43:26 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-12-20 03:43:26 +0400 |
| commit | 29e3b098253270d4c5cf8337ad068bf4e98d7bdb (patch) | |
| tree | 2e3b0b29ed17a172e2ecfb040aa23c723fa88900 /source/blender/compositor/intern/COM_compositor.cpp | |
| parent | 8ed0878f0f6b2b37c709fffa514e11cac24ec94d (diff) | |
Fix T37890: compositor did not take number of thread setting into account.
Diffstat (limited to 'source/blender/compositor/intern/COM_compositor.cpp')
| -rw-r--r-- | source/blender/compositor/intern/COM_compositor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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); |