[Bf-blender-cvs] [04b90ee18a1] blender-v2.93-release: Fix compilation error after recent compositor fix

Sergey Sharybin noreply at git.blender.org
Mon May 3 15:40:28 CEST 2021


Commit: 04b90ee18a13ab0c1347dfc75191fb1905148280
Author: Sergey Sharybin
Date:   Mon May 3 15:37:41 2021 +0200
Branches: blender-v2.93-release
https://developer.blender.org/rB04b90ee18a13ab0c1347dfc75191fb1905148280

Fix compilation error after recent compositor fix

Apparently, there is no emplace semantic available in the Vector in
the stable branch.

===================================================================

M	source/blender/compositor/intern/COM_WorkScheduler.cc

===================================================================

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;



More information about the Bf-blender-cvs mailing list