[Bf-blender-cvs] [b9447ab053f] master: Cleanup: Replace ptr with ref.
Jeroen Bakker
noreply at git.blender.org
Fri Mar 19 17:18:39 CET 2021
Commit: b9447ab053ffe660b7eb1ef8f60bf436a1cec600
Author: Jeroen Bakker
Date: Fri Mar 19 14:42:34 2021 +0100
Branches: master
https://developer.blender.org/rBb9447ab053ffe660b7eb1ef8f60bf436a1cec600
Cleanup: Replace ptr with ref.
===================================================================
M source/blender/compositor/intern/COM_ExecutionGroup.cc
M source/blender/compositor/intern/COM_ExecutionGroup.h
===================================================================
diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cc b/source/blender/compositor/intern/COM_ExecutionGroup.cc
index 9db018e5cf3..be54d6582fb 100644
--- a/source/blender/compositor/intern/COM_ExecutionGroup.cc
+++ b/source/blender/compositor/intern/COM_ExecutionGroup.cc
@@ -70,19 +70,19 @@ CompositorPriority ExecutionGroup::getRenderPriotrity()
return this->getOutputOperation()->getRenderPriority();
}
-bool ExecutionGroup::canContainOperation(NodeOperation *operation)
+bool ExecutionGroup::can_contain(NodeOperation &operation)
{
if (!this->m_initialized) {
return true;
}
- if (operation->isReadBufferOperation()) {
+ if (operation.isReadBufferOperation()) {
return true;
}
- if (operation->isWriteBufferOperation()) {
+ if (operation.isWriteBufferOperation()) {
return false;
}
- if (operation->isSetOperation()) {
+ if (operation.isSetOperation()) {
return true;
}
@@ -92,7 +92,7 @@ bool ExecutionGroup::canContainOperation(NodeOperation *operation)
}
/* complex ops can't be added to other groups (except their own, which they initialize, see
* above) */
- if (operation->isComplex()) {
+ if (operation.isComplex()) {
return false;
}
@@ -101,7 +101,7 @@ bool ExecutionGroup::canContainOperation(NodeOperation *operation)
bool ExecutionGroup::addOperation(NodeOperation *operation)
{
- if (!canContainOperation(operation)) {
+ if (!can_contain(*operation)) {
return false;
}
diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.h b/source/blender/compositor/intern/COM_ExecutionGroup.h
index 565c1538f1f..471f6ae4545 100644
--- a/source/blender/compositor/intern/COM_ExecutionGroup.h
+++ b/source/blender/compositor/intern/COM_ExecutionGroup.h
@@ -184,7 +184,7 @@ class ExecutionGroup {
* \brief check whether parameter operation can be added to the execution group
* \param operation: the operation to be added
*/
- bool canContainOperation(NodeOperation *operation);
+ bool can_contain(NodeOperation &operation);
/**
* \brief calculate the actual chunk size of this execution group.
More information about the Bf-blender-cvs
mailing list