diff options
Diffstat (limited to 'source/blender/compositor/operations/COM_ConvertOperation.cpp')
| -rw-r--r-- | source/blender/compositor/operations/COM_ConvertOperation.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/compositor/operations/COM_ConvertOperation.cpp b/source/blender/compositor/operations/COM_ConvertOperation.cpp index 0bd3f5b8796..cccfd407752 100644 --- a/source/blender/compositor/operations/COM_ConvertOperation.cpp +++ b/source/blender/compositor/operations/COM_ConvertOperation.cpp @@ -22,7 +22,7 @@ ConvertBaseOperation::ConvertBaseOperation() { - this->m_inputOperation = NULL; + this->m_inputOperation = nullptr; } void ConvertBaseOperation::initExecution() @@ -32,7 +32,7 @@ void ConvertBaseOperation::initExecution() void ConvertBaseOperation::deinitExecution() { - this->m_inputOperation = NULL; + this->m_inputOperation = nullptr; } /* ******** Value to Color ******** */ @@ -397,11 +397,11 @@ void ConvertStraightToPremulOperation::executePixelSampled(float output[4], /* ******** Separate Channels ******** */ -SeparateChannelOperation::SeparateChannelOperation() : NodeOperation() +SeparateChannelOperation::SeparateChannelOperation() { this->addInputSocket(COM_DT_COLOR); this->addOutputSocket(COM_DT_VALUE); - this->m_inputOperation = NULL; + this->m_inputOperation = nullptr; } void SeparateChannelOperation::initExecution() { @@ -410,7 +410,7 @@ void SeparateChannelOperation::initExecution() void SeparateChannelOperation::deinitExecution() { - this->m_inputOperation = NULL; + this->m_inputOperation = nullptr; } void SeparateChannelOperation::executePixelSampled(float output[4], @@ -425,7 +425,7 @@ void SeparateChannelOperation::executePixelSampled(float output[4], /* ******** Combine Channels ******** */ -CombineChannelsOperation::CombineChannelsOperation() : NodeOperation() +CombineChannelsOperation::CombineChannelsOperation() { this->addInputSocket(COM_DT_VALUE); this->addInputSocket(COM_DT_VALUE); @@ -433,10 +433,10 @@ CombineChannelsOperation::CombineChannelsOperation() : NodeOperation() this->addInputSocket(COM_DT_VALUE); this->addOutputSocket(COM_DT_COLOR); this->setResolutionInputSocketIndex(0); - this->m_inputChannel1Operation = NULL; - this->m_inputChannel2Operation = NULL; - this->m_inputChannel3Operation = NULL; - this->m_inputChannel4Operation = NULL; + this->m_inputChannel1Operation = nullptr; + this->m_inputChannel2Operation = nullptr; + this->m_inputChannel3Operation = nullptr; + this->m_inputChannel4Operation = nullptr; } void CombineChannelsOperation::initExecution() @@ -449,10 +449,10 @@ void CombineChannelsOperation::initExecution() void CombineChannelsOperation::deinitExecution() { - this->m_inputChannel1Operation = NULL; - this->m_inputChannel2Operation = NULL; - this->m_inputChannel3Operation = NULL; - this->m_inputChannel4Operation = NULL; + this->m_inputChannel1Operation = nullptr; + this->m_inputChannel2Operation = nullptr; + this->m_inputChannel3Operation = nullptr; + this->m_inputChannel4Operation = nullptr; } void CombineChannelsOperation::executePixelSampled(float output[4], |