diff options
| author | Julian Eisel <julian@blender.org> | 2021-03-31 23:53:03 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2021-03-31 23:53:03 +0300 |
| commit | c7904d2398fd4d43d15268c792aa15ea8ee538fe (patch) | |
| tree | 484fd7f66ac59c82abd4aca18894f991b4935483 /source/blender/compositor/operations/COM_CalculateMeanOperation.cc | |
| parent | 91b87d8d7fb8aec62faf00e5e0c3619d2753a92e (diff) | |
| parent | 1a100d2d78c75c9a6ac015606cc16698e7775682 (diff) | |
Merge branch 'master' into ui-asset-view-templateui-asset-view-template
Diffstat (limited to 'source/blender/compositor/operations/COM_CalculateMeanOperation.cc')
| -rw-r--r-- | source/blender/compositor/operations/COM_CalculateMeanOperation.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/compositor/operations/COM_CalculateMeanOperation.cc b/source/blender/compositor/operations/COM_CalculateMeanOperation.cc index fdeecd0cb29..a7ea49aed8d 100644 --- a/source/blender/compositor/operations/COM_CalculateMeanOperation.cc +++ b/source/blender/compositor/operations/COM_CalculateMeanOperation.cc @@ -22,14 +22,16 @@ #include "IMB_colormanagement.h" +namespace blender::compositor { + CalculateMeanOperation::CalculateMeanOperation() { - this->addInputSocket(DataType::Color, COM_SC_NO_RESIZE); + this->addInputSocket(DataType::Color, ResizeMode::None); this->addOutputSocket(DataType::Value); this->m_imageReader = nullptr; this->m_iscalculated = false; this->m_setting = 1; - this->setComplex(true); + this->flags.complex = true; } void CalculateMeanOperation::initExecution() { @@ -125,3 +127,5 @@ void CalculateMeanOperation::calculateMean(MemoryBuffer *tile) } this->m_result = sum / pixels; } + +} // namespace blender::compositor |