[Bf-blender-cvs] [2371454b2da] master: Cleanup: Replace Methode Overloading With Default Value.
Jeroen Bakker
noreply at git.blender.org
Fri Mar 26 16:03:40 CET 2021
Commit: 2371454b2da4eab159315b3f1da6b683af9dbe04
Author: Jeroen Bakker
Date: Fri Mar 26 15:56:27 2021 +0100
Branches: master
https://developer.blender.org/rB2371454b2da4eab159315b3f1da6b683af9dbe04
Cleanup: Replace Methode Overloading With Default Value.
===================================================================
M source/blender/compositor/intern/COM_NodeOperation.cc
M source/blender/compositor/intern/COM_NodeOperation.h
===================================================================
diff --git a/source/blender/compositor/intern/COM_NodeOperation.cc b/source/blender/compositor/intern/COM_NodeOperation.cc
index e68c53bd7b2..a8559b76d21 100644
--- a/source/blender/compositor/intern/COM_NodeOperation.cc
+++ b/source/blender/compositor/intern/COM_NodeOperation.cc
@@ -62,27 +62,18 @@ void NodeOperation::addOutputSocket(DataType datatype)
void NodeOperation::determineResolution(unsigned int resolution[2],
unsigned int preferredResolution[2])
{
- unsigned int temp[2];
- unsigned int temp2[2];
+ NodeOperationInput &input = m_inputs[m_resolutionInputSocketIndex];
+ input.determineResolution(resolution, preferredResolution);
+ unsigned int temp2[2] = {resolution[0], resolution[1]};
- // TODO(jbakker): Replace for loops with direct array access.
+ unsigned int temp[2];
for (unsigned int index = 0; index < m_inputs.size(); index++) {
- NodeOperationInput &input = m_inputs[index];
- if (input.isConnected()) {
- if (index == this->m_resolutionInputSocketIndex) {
- input.determineResolution(resolution, preferredResolution);
- temp2[0] = resolution[0];
- temp2[1] = resolution[1];
- break;
- }
+ if (index == this->m_resolutionInputSocketIndex) {
+ continue;
}
- }
- for (unsigned int index = 0; index < m_inputs.size(); index++) {
NodeOperationInput &input = m_inputs[index];
if (input.isConnected()) {
- if (index != this->m_resolutionInputSocketIndex) {
- input.determineResolution(temp, temp2);
- }
+ input.determineResolution(temp, temp2);
}
}
}
diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h
index 5b9375ae531..b06a453a775 100644
--- a/source/blender/compositor/intern/COM_NodeOperation.h
+++ b/source/blender/compositor/intern/COM_NodeOperation.h
@@ -238,11 +238,7 @@ class NodeOperation {
{
return m_outputs.size();
}
- NodeOperationOutput *getOutputSocket(unsigned int index);
- NodeOperationOutput *getOutputSocket()
- {
- return getOutputSocket(0);
- }
+ NodeOperationOutput *getOutputSocket(unsigned int index = 0);
NodeOperationInput *getInputSocket(unsigned int index);
/** Check if this is an input operation
More information about the Bf-blender-cvs
mailing list