From 6fb4bbdbd963eb0f9626d6bd784b22c65bd5cd44 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 16 Aug 2012 13:15:13 +0000 Subject: [PATCH] compositor bokeh blur - only use the variable size operation when the size socket is connected. --- source/blender/compositor/nodes/COM_BokehBlurNode.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/source/blender/compositor/nodes/COM_BokehBlurNode.cpp b/source/blender/compositor/nodes/COM_BokehBlurNode.cpp index 9abf97aa16f..70f20e3235b 100644 --- a/source/blender/compositor/nodes/COM_BokehBlurNode.cpp +++ b/source/blender/compositor/nodes/COM_BokehBlurNode.cpp @@ -38,7 +38,11 @@ void BokehBlurNode::convertToOperations(ExecutionSystem *graph, CompositorContex { bNode *b_node = this->getbNode(); - if (b_node->custom1 & CMP_NODEFLAG_BLUR_VARIABLE_SIZE) { + InputSocket *inputSizeSocket = this->getInputSocket(2); + + bool connectedSizeSocket = inputSizeSocket->isConnected(); + + if ((b_node->custom1 & CMP_NODEFLAG_BLUR_VARIABLE_SIZE) && connectedSizeSocket) { VariableSizeBokehBlurOperation *operation = new VariableSizeBokehBlurOperation(); this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph); @@ -55,9 +59,6 @@ void BokehBlurNode::convertToOperations(ExecutionSystem *graph, CompositorContex } else { BokehBlurOperation *operation = new BokehBlurOperation(); - InputSocket *inputSizeSocket = this->getInputSocket(2); - - bool connectedSizeSocket = inputSizeSocket->isConnected(); const bNodeSocket *sock = this->getInputSocket(2)->getbNodeSocket(); const float size = ((const bNodeSocketValueFloat *)sock->default_value)->value;