diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-03-14 20:25:32 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-03-14 20:25:32 +0400 |
commit | 2b845d3b2acf095588fa2e392da5ea8f5e2b119e (patch) | |
tree | 6005dcde83731b95b06e600ae299439244bd5e42 /source/blender/compositor/operations | |
parent | 84b90c29680efba4a7a7b75b69c35bd0a16c5901 (diff) |
There was a regression in recent bugfix which touched Mix node.
This commit hopefully fixes that regression.
Diffstat (limited to 'source/blender/compositor/operations')
-rw-r--r-- | source/blender/compositor/operations/COM_MixBaseOperation.cpp | 16 | ||||
-rw-r--r-- | source/blender/compositor/operations/COM_MixBaseOperation.h | 2 |
2 files changed, 0 insertions, 18 deletions
diff --git a/source/blender/compositor/operations/COM_MixBaseOperation.cpp b/source/blender/compositor/operations/COM_MixBaseOperation.cpp index 5e3dbc2eaa3..438fb84ebb7 100644 --- a/source/blender/compositor/operations/COM_MixBaseOperation.cpp +++ b/source/blender/compositor/operations/COM_MixBaseOperation.cpp @@ -69,19 +69,3 @@ void MixBaseOperation::deinitExecution() this->m_inputColor1Operation = NULL; this->m_inputColor2Operation = NULL; } - -void MixBaseOperation::determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]) -{ - if (this->getInputSocket(1)->isConnected()) { - this->setResolutionInputSocketIndex(1); - } - else { - if (this->getInputSocket(2)->isConnected()) { - this->setResolutionInputSocketIndex(2); - } - else { - this->setResolutionInputSocketIndex(0); - } - } - NodeOperation::determineResolution(resolution, preferredResolution); -} diff --git a/source/blender/compositor/operations/COM_MixBaseOperation.h b/source/blender/compositor/operations/COM_MixBaseOperation.h index 88d1d00c2bf..75ca1c3f6c6 100644 --- a/source/blender/compositor/operations/COM_MixBaseOperation.h +++ b/source/blender/compositor/operations/COM_MixBaseOperation.h @@ -71,8 +71,6 @@ public: */ void deinitExecution(); - void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]); - void setUseValueAlphaMultiply(const bool value) { this->m_valueAlphaMultiply = value; } bool useValueAlphaMultiply() { return this->m_valueAlphaMultiply; } void setUseClamp(bool value) { this->m_useClamp = value; } |