diff options
| -rw-r--r-- | source/blender/compositor/operations/COM_MixBaseOperation.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/source/blender/compositor/operations/COM_MixBaseOperation.cpp b/source/blender/compositor/operations/COM_MixBaseOperation.cpp index 2d40629e764..5e3dbc2eaa3 100644 --- a/source/blender/compositor/operations/COM_MixBaseOperation.cpp +++ b/source/blender/compositor/operations/COM_MixBaseOperation.cpp @@ -72,21 +72,11 @@ void MixBaseOperation::deinitExecution() void MixBaseOperation::determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]) { - InputSocket *socket; - unsigned int tempPreferredResolution[2] = {0, 0}; - unsigned int tempResolution[2]; - - socket = this->getInputSocket(1); - socket->determineResolution(tempResolution, tempPreferredResolution); - if ((tempResolution[0] != 0) && (tempResolution[1] != 0)) { + if (this->getInputSocket(1)->isConnected()) { this->setResolutionInputSocketIndex(1); } else { - socket = this->getInputSocket(2); - tempPreferredResolution[0] = 0; - tempPreferredResolution[1] = 0; - socket->determineResolution(tempResolution, tempPreferredResolution); - if ((tempResolution[0] != 0) && (tempResolution[1] != 0)) { + if (this->getInputSocket(2)->isConnected()) { this->setResolutionInputSocketIndex(2); } else { |