blender
/
blender
137
409
Fork 592
Code Issues 6.3k Pull Requests 777 Projects 19 Wiki Activity

Fix compilation error after recent compositor fix 

Apparently, there is no emplace semantic available in the Vector in
the stable branch.
This commit is contained in:
Sergey Sharybin 2021-05-03 15:37:41 +02:00
parent 1b4f0bf32a
commit 04b90ee18a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/compositor/intern/COM_WorkScheduler.cc
View File

@ -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;