diff options
| author | Manuel Castilla <manzanillawork@gmail.com> | 2021-08-02 14:41:29 +0300 |
|---|---|---|
| committer | Manuel Castilla <manzanillawork@gmail.com> | 2021-08-02 14:41:29 +0300 |
| commit | f330f43f109d2532e8a4fb47ffafeec0ace6408b (patch) | |
| tree | c69e75be267efa5c57c27f60dda6f18139a7c6a7 /source/blender/compositor/intern | |
| parent | 4908abda5f3e1b4c1d0ee92247f0620d3096d236 (diff) | |
| parent | 8edb2222ae0c954771a9cddc2d8c02a7a4d68eae (diff) | |
Merge branch 'master' into compositor-full-frame
Diffstat (limited to 'source/blender/compositor/intern')
| -rw-r--r-- | source/blender/compositor/intern/COM_ExecutionSystem.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.cc b/source/blender/compositor/intern/COM_ExecutionSystem.cc index a449d86deb9..c92e292c74f 100644 --- a/source/blender/compositor/intern/COM_ExecutionSystem.cc +++ b/source/blender/compositor/intern/COM_ExecutionSystem.cc @@ -43,6 +43,7 @@ ExecutionSystem::ExecutionSystem(RenderData *rd, const ColorManagedDisplaySettings *displaySettings, const char *viewName) { + num_work_threads_ = WorkScheduler::get_num_cpu_threads(); this->m_context.setViewName(viewName); this->m_context.setScene(scene); this->m_context.setbNodeTree(editingtree); @@ -82,7 +83,6 @@ ExecutionSystem::ExecutionSystem(RenderData *rd, BLI_assert_msg(0, "Non implemented execution model"); break; } - num_work_threads_ = WorkScheduler::get_num_cpu_threads(); } ExecutionSystem::~ExecutionSystem() |