1 files changed, 18 insertions, 22 deletions

diff --git a/source/blender/compositor/nodes/COM_BoxMaskNode.cpp b/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
index e3fb6ecc704..b8bf23b8549 100644
--- a/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
+++ b/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
@@ -32,47 +32,43 @@ BoxMaskNode::BoxMaskNode(bNode *editorNode) : Node(editorNode)
 	/* pass */
 }
 
-void BoxMaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
+void BoxMaskNode::convertToOperations(NodeConverter &converter, const CompositorContext &context) const
 {
+	NodeInput *inputSocket = this->getInputSocket(0);
+	NodeOutput *outputSocket = this->getOutputSocket(0);
+	
 	BoxMaskOperation *operation;
 	operation = new BoxMaskOperation();
 	operation->setData((NodeBoxMask *)this->getbNode()->storage);
-
-	InputSocket *inputSocket = this->getInputSocket(0);
-	OutputSocket *outputSocket = this->getOutputSocket(0);
-
-	if (inputSocket->isConnected()) {
-		inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
-		outputSocket->relinkConnections(operation->getOutputSocket());
+	operation->setMaskType(this->getbNode()->custom1);
+	converter.addOperation(operation);
+	
+	if (inputSocket->isLinked()) {
+		converter.mapInputSocket(inputSocket, operation->getInputSocket(0));
+		converter.mapOutputSocket(outputSocket, operation->getOutputSocket());
 	}
 	else {
 		/* Value operation to produce original transparent image */
 		SetValueOperation *valueOperation = new SetValueOperation();
 		valueOperation->setValue(0.0f);
-		graph->addOperation(valueOperation);
+		converter.addOperation(valueOperation);
 
 		/* Scale that image up to render resolution */
-		const RenderData *rd = context->getRenderData();
+		const RenderData *rd = context.getRenderData();
 		ScaleFixedSizeOperation *scaleOperation = new ScaleFixedSizeOperation();
 
 		scaleOperation->setIsAspect(false);
 		scaleOperation->setIsCrop(false);
 		scaleOperation->setOffset(0.0f, 0.0f);
-
 		scaleOperation->setNewWidth(rd->xsch * rd->size / 100.0f);
 		scaleOperation->setNewHeight(rd->ysch * rd->size / 100.0f);
+		scaleOperation->getInputSocket(0)->setResizeMode(COM_SC_NO_RESIZE);
+		converter.addOperation(scaleOperation);
 
-		addLink(graph, valueOperation->getOutputSocket(0), scaleOperation->getInputSocket(0));
-		addLink(graph, scaleOperation->getOutputSocket(0), operation->getInputSocket(0));
-		outputSocket->relinkConnections(operation->getOutputSocket(0));
-
-		scaleOperation->getInputSocket(0)->getConnection()->setIgnoreResizeCheck(true);
-
-		graph->addOperation(scaleOperation);
+		converter.addLink(valueOperation->getOutputSocket(0), scaleOperation->getInputSocket(0));
+		converter.addLink(scaleOperation->getOutputSocket(0), operation->getInputSocket(0));
+		converter.mapOutputSocket(outputSocket, operation->getOutputSocket(0));
 	}
 
-	this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph);
-	operation->setMaskType(this->getbNode()->custom1);
-	
-	graph->addOperation(operation);
+	converter.mapInputSocket(getInputSocket(1), operation->getInputSocket(1));
 }