diff options
author | Sergey Sharybin <sergey@blender.org> | 2021-05-03 16:37:41 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey@blender.org> | 2021-05-03 16:37:41 +0300 |
commit | 04b90ee18a13ab0c1347dfc75191fb1905148280 (patch) | |
tree | b90723dad94db126ecb21db99cebeef1bc6e8092 /source/blender | |
parent | 1b4f0bf32aa5215325ca33f81898a7eeef9da2f8 (diff) |
Fix compilation error after recent compositor fix
Apparently, there is no emplace semantic available in the Vector in
the stable branch.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/compositor/intern/COM_WorkScheduler.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cc b/source/blender/compositor/intern/COM_WorkScheduler.cc index d578ac24a4a..ee3a6dedd44 100644 --- a/source/blender/compositor/intern/COM_WorkScheduler.cc +++ b/source/blender/compositor/intern/COM_WorkScheduler.cc @@ -263,10 +263,10 @@ static void opencl_initialize(const bool use_opencl) if (error2 != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error2, clewErrorString(error2)); } - g_work_scheduler.opencl.devices.append_as(g_work_scheduler.opencl.context, - device, - g_work_scheduler.opencl.program, - vendorID); + g_work_scheduler.opencl.devices.append(OpenCLDevice(g_work_scheduler.opencl.context, + device, + g_work_scheduler.opencl.program, + vendorID)); } } MEM_freeN(cldevices); @@ -368,7 +368,7 @@ static void threading_model_queue_initialize(const int num_cpu_threads) /* Initialize CPU threads. */ if (!g_work_scheduler.queue.initialized) { for (int index = 0; index < num_cpu_threads; index++) { - g_work_scheduler.queue.devices.append_as(index); + g_work_scheduler.queue.devices.append(CPUDevice(index)); } BLI_thread_local_create(g_thread_device); g_work_scheduler.queue.initialized = true; |