[Bf-blender-cvs] [b452438d0a0] master: Cleanup: Use snake case for method names.
Jeroen Bakker
noreply at git.blender.org
Wed Feb 17 16:51:07 CET 2021
Commit: b452438d0a035b476f912d1962d0403af75e0021
Author: Jeroen Bakker
Date: Wed Feb 17 16:23:21 2021 +0100
Branches: master
https://developer.blender.org/rBb452438d0a035b476f912d1962d0403af75e0021
Cleanup: Use snake case for method names.
===================================================================
M source/blender/compositor/intern/COM_ExecutionSystem.cpp
M source/blender/compositor/intern/COM_WorkScheduler.cpp
M source/blender/compositor/intern/COM_WorkScheduler.h
===================================================================
diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.cpp b/source/blender/compositor/intern/COM_ExecutionSystem.cpp
index 34682aae2fd..4c0c7d2103e 100644
--- a/source/blender/compositor/intern/COM_ExecutionSystem.cpp
+++ b/source/blender/compositor/intern/COM_ExecutionSystem.cpp
@@ -59,7 +59,7 @@ ExecutionSystem::ExecutionSystem(RenderData *rd,
this->m_context.setQuality((CompositorQuality)editingtree->edit_quality);
}
this->m_context.setRendering(rendering);
- this->m_context.setHasActiveOpenCLDevices(WorkScheduler::hasGPUDevices() &&
+ this->m_context.setHasActiveOpenCLDevices(WorkScheduler::has_gpu_devices() &&
(editingtree->flag & NTREE_COM_OPENCL));
this->m_context.setRenderData(rd);
diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cpp b/source/blender/compositor/intern/COM_WorkScheduler.cpp
index f726caa3d66..fd2a21a3b2b 100644
--- a/source/blender/compositor/intern/COM_WorkScheduler.cpp
+++ b/source/blender/compositor/intern/COM_WorkScheduler.cpp
@@ -178,7 +178,7 @@ void WorkScheduler::stop()
#endif
}
-bool WorkScheduler::hasGPUDevices()
+bool WorkScheduler::has_gpu_devices()
{
#if COM_CURRENT_THREADING_MODEL == COM_TM_QUEUE
# ifdef COM_OPENCL_ENABLED
diff --git a/source/blender/compositor/intern/COM_WorkScheduler.h b/source/blender/compositor/intern/COM_WorkScheduler.h
index 1911100ab94..09cf0df8827 100644
--- a/source/blender/compositor/intern/COM_WorkScheduler.h
+++ b/source/blender/compositor/intern/COM_WorkScheduler.h
@@ -102,7 +102,7 @@ class WorkScheduler {
* A node can generate a different operation tree when OpenCLDevices exists.
* \see CompositorContext.getHasActiveOpenCLDevices
*/
- static bool hasGPUDevices();
+ static bool has_gpu_devices();
static int current_thread_id();
More information about the Bf-blender-cvs
mailing list