From 9b45f607c927028960406bb558a9fe7d9f67c0ba Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Wed, 23 May 2012 12:45:07 +0000 Subject: cleanup relink code --- source/blender/compositor/nodes/COM_AlphaOverNode.cpp | 6 +++--- .../blender/compositor/nodes/COM_BilateralBlurNode.cpp | 4 ++-- source/blender/compositor/nodes/COM_BlurNode.cpp | 12 ++++++------ source/blender/compositor/nodes/COM_BokehBlurNode.cpp | 12 ++++++------ source/blender/compositor/nodes/COM_BoxMaskNode.cpp | 4 ++-- source/blender/compositor/nodes/COM_BrightnessNode.cpp | 6 +++--- source/blender/compositor/nodes/COM_ChannelMatteNode.cpp | 4 ++-- source/blender/compositor/nodes/COM_ChromaMatteNode.cpp | 4 ++-- source/blender/compositor/nodes/COM_ColorBalanceNode.cpp | 4 ++-- .../blender/compositor/nodes/COM_ColorCorrectionNode.cpp | 4 ++-- source/blender/compositor/nodes/COM_ColorCurveNode.cpp | 8 ++++---- source/blender/compositor/nodes/COM_ColorMatteNode.cpp | 4 ++-- source/blender/compositor/nodes/COM_ColorRampNode.cpp | 2 +- source/blender/compositor/nodes/COM_ColorSpillNode.cpp | 4 ++-- source/blender/compositor/nodes/COM_ColorToBWNode.cpp | 2 +- source/blender/compositor/nodes/COM_CombineRGBANode.cpp | 8 ++++---- source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp | 2 +- source/blender/compositor/nodes/COM_CropNode.cpp | 2 +- source/blender/compositor/nodes/COM_DefocusNode.cpp | 8 ++++---- .../blender/compositor/nodes/COM_DifferenceMatteNode.cpp | 4 ++-- source/blender/compositor/nodes/COM_DilateErodeNode.cpp | 6 +++--- .../blender/compositor/nodes/COM_DirectionalBlurNode.cpp | 2 +- source/blender/compositor/nodes/COM_DisplaceNode.cpp | 8 ++++---- .../blender/compositor/nodes/COM_DistanceMatteNode.cpp | 4 ++-- .../blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp | 4 ++-- source/blender/compositor/nodes/COM_EllipseMaskNode.cpp | 4 ++-- source/blender/compositor/nodes/COM_FilterNode.cpp | 4 ++-- source/blender/compositor/nodes/COM_FlipNode.cpp | 2 +- source/blender/compositor/nodes/COM_GammaNode.cpp | 4 ++-- source/blender/compositor/nodes/COM_GlareNode.cpp | 6 +++--- source/blender/compositor/nodes/COM_GroupNode.cpp | 4 ++-- .../nodes/COM_HueSaturationValueCorrectNode.cpp | 4 ++-- .../compositor/nodes/COM_HueSaturationValueNode.cpp | 4 ++-- source/blender/compositor/nodes/COM_IDMaskNode.cpp | 2 +- source/blender/compositor/nodes/COM_InvertNode.cpp | 4 ++-- .../blender/compositor/nodes/COM_LensDistortionNode.cpp | 4 ++-- .../blender/compositor/nodes/COM_LuminanceMatteNode.cpp | 2 +- source/blender/compositor/nodes/COM_MapUVNode.cpp | 4 ++-- source/blender/compositor/nodes/COM_MapValueNode.cpp | 2 +- source/blender/compositor/nodes/COM_MathNode.cpp | 4 ++-- source/blender/compositor/nodes/COM_MixNode.cpp | 6 +++--- .../blender/compositor/nodes/COM_MovieDistortionNode.cpp | 2 +- source/blender/compositor/nodes/COM_NormalNode.cpp | 2 +- source/blender/compositor/nodes/COM_NormalizeNode.cpp | 2 +- source/blender/compositor/nodes/COM_RotateNode.cpp | 4 ++-- source/blender/compositor/nodes/COM_ScaleNode.cpp | 16 ++++++++-------- source/blender/compositor/nodes/COM_SeparateRGBANode.cpp | 8 ++++---- source/blender/compositor/nodes/COM_SetAlphaNode.cpp | 4 ++-- source/blender/compositor/nodes/COM_SplitViewerNode.cpp | 4 ++-- source/blender/compositor/nodes/COM_Stabilize2dNode.cpp | 2 +- source/blender/compositor/nodes/COM_SwitchNode.cpp | 4 ++-- source/blender/compositor/nodes/COM_TextureNode.cpp | 4 ++-- source/blender/compositor/nodes/COM_TonemapNode.cpp | 2 +- source/blender/compositor/nodes/COM_TransformNode.cpp | 10 +++++----- source/blender/compositor/nodes/COM_TranslateNode.cpp | 6 +++--- source/blender/compositor/nodes/COM_VectorBlurNode.cpp | 6 +++--- source/blender/compositor/nodes/COM_VectorCurveNode.cpp | 2 +- source/blender/compositor/nodes/COM_ViewLevelsNode.cpp | 4 ++-- source/blender/compositor/nodes/COM_ViewerNode.cpp | 2 +- source/blender/compositor/nodes/COM_ZCombineNode.cpp | 12 ++++++------ 60 files changed, 142 insertions(+), 142 deletions(-) (limited to 'source/blender/compositor/nodes') diff --git a/source/blender/compositor/nodes/COM_AlphaOverNode.cpp b/source/blender/compositor/nodes/COM_AlphaOverNode.cpp index 0037480d2e9..eb3cd821172 100644 --- a/source/blender/compositor/nodes/COM_AlphaOverNode.cpp +++ b/source/blender/compositor/nodes/COM_AlphaOverNode.cpp @@ -64,9 +64,9 @@ void AlphaOverNode::convertToOperations(ExecutionSystem *graph, CompositorContex else { convertProg->setResolutionInputSocketIndex(0); } - valueSocket->relinkConnections(convertProg->getInputSocket(0), true, 0, graph); - color1Socket->relinkConnections(convertProg->getInputSocket(1), true, 1, graph); - color2Socket->relinkConnections(convertProg->getInputSocket(2), true, 2, graph); + valueSocket->relinkConnections(convertProg->getInputSocket(0), 0, graph); + color1Socket->relinkConnections(convertProg->getInputSocket(1), 1, graph); + color2Socket->relinkConnections(convertProg->getInputSocket(2), 2, graph); outputSocket->relinkConnections(convertProg->getOutputSocket(0)); graph->addOperation(convertProg); } diff --git a/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp b/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp index 436d92df7f8..fa654d35785 100644 --- a/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp +++ b/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp @@ -36,8 +36,8 @@ void BilateralBlurNode::convertToOperations(ExecutionSystem *graph, CompositorCo BilateralBlurOperation *operation = new BilateralBlurOperation(); operation->setQuality(context->getQuality()); operation->setData(data); - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, graph); - this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), true, 1, graph); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph); + this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph); this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket()); graph->addOperation(operation); } diff --git a/source/blender/compositor/nodes/COM_BlurNode.cpp b/source/blender/compositor/nodes/COM_BlurNode.cpp index 789a6a6eee2..90b2481cc7d 100644 --- a/source/blender/compositor/nodes/COM_BlurNode.cpp +++ b/source/blender/compositor/nodes/COM_BlurNode.cpp @@ -50,8 +50,8 @@ void BlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext * c if (data->filtertype == R_FILTER_FAST_GAUSS) { FastGaussianBlurOperation *operationfgb = new FastGaussianBlurOperation(); operationfgb->setData(data); - this->getInputSocket(0)->relinkConnections(operationfgb->getInputSocket(0), true, 0, graph); - this->getInputSocket(1)->relinkConnections(operationfgb->getInputSocket(1), true, 1, graph); + this->getInputSocket(0)->relinkConnections(operationfgb->getInputSocket(0), 0, graph); + this->getInputSocket(1)->relinkConnections(operationfgb->getInputSocket(1), 1, graph); this->getOutputSocket(0)->relinkConnections(operationfgb->getOutputSocket(0)); graph->addOperation(operationfgb); addPreviewOperation(graph, operationfgb->getOutputSocket(), 5); @@ -60,8 +60,8 @@ void BlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext * c GaussianXBlurOperation *operationx = new GaussianXBlurOperation(); operationx->setData(data); operationx->setQuality(quality); - this->getInputSocket(0)->relinkConnections(operationx->getInputSocket(0), true, 0, graph); - this->getInputSocket(1)->relinkConnections(operationx->getInputSocket(1), true, 1, graph); + this->getInputSocket(0)->relinkConnections(operationx->getInputSocket(0), 0, graph); + this->getInputSocket(1)->relinkConnections(operationx->getInputSocket(1), 1, graph); graph->addOperation(operationx); GaussianYBlurOperation *operationy = new GaussianYBlurOperation(); operationy->setData(data); @@ -75,8 +75,8 @@ void BlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext * c else { GaussianBokehBlurOperation *operation = new GaussianBokehBlurOperation(); operation->setData(data); - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, graph); - this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), true, 1, graph); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph); + this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph); operation->setQuality(quality); graph->addOperation(operation); this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket()); diff --git a/source/blender/compositor/nodes/COM_BokehBlurNode.cpp b/source/blender/compositor/nodes/COM_BokehBlurNode.cpp index 9e80d024bd2..d6f4f58fe70 100644 --- a/source/blender/compositor/nodes/COM_BokehBlurNode.cpp +++ b/source/blender/compositor/nodes/COM_BokehBlurNode.cpp @@ -45,9 +45,9 @@ void BokehBlurNode::convertToOperations(ExecutionSystem *graph, CompositorContex converter->setCameraObject(camob); operation->setMaxBlur(16); operation->setQuality(context->getQuality()); - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, graph); - this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), true, 1, graph); - this->getInputSocket(2)->relinkConnections(converter->getInputSocket(0), true, 2, graph); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph); + this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph); + this->getInputSocket(2)->relinkConnections(converter->getInputSocket(0), 2, graph); addLink(graph, converter->getOutputSocket(), operation->getInputSocket(2)); graph->addOperation(operation); graph->addOperation(converter); @@ -55,9 +55,9 @@ void BokehBlurNode::convertToOperations(ExecutionSystem *graph, CompositorContex } else { BokehBlurOperation *operation = new BokehBlurOperation(); - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, graph); - this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), true, 1, graph); - this->getInputSocket(3)->relinkConnections(operation->getInputSocket(2), true, 3, graph); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph); + this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph); + this->getInputSocket(3)->relinkConnections(operation->getInputSocket(2), 3, graph); operation->setSize(((bNodeSocketValueFloat*)this->getInputSocket(2)->getbNodeSocket()->default_value)->value); operation->setQuality(context->getQuality()); graph->addOperation(operation); diff --git a/source/blender/compositor/nodes/COM_BoxMaskNode.cpp b/source/blender/compositor/nodes/COM_BoxMaskNode.cpp index 322b5893096..e99252663d0 100644 --- a/source/blender/compositor/nodes/COM_BoxMaskNode.cpp +++ b/source/blender/compositor/nodes/COM_BoxMaskNode.cpp @@ -34,8 +34,8 @@ void BoxMaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext BoxMaskOperation *operation; operation = new BoxMaskOperation(); operation->setData((NodeBoxMask*)this->getbNode()->storage); - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, graph); - this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), true, 1, graph); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph); + this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph); this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0)); operation->setMaskType(this->getbNode()->custom1); diff --git a/source/blender/compositor/nodes/COM_BrightnessNode.cpp b/source/blender/compositor/nodes/COM_BrightnessNode.cpp index c4fac50334c..9ccb58a45de 100644 --- a/source/blender/compositor/nodes/COM_BrightnessNode.cpp +++ b/source/blender/compositor/nodes/COM_BrightnessNode.cpp @@ -32,9 +32,9 @@ BrightnessNode::BrightnessNode(bNode *editorNode): Node(editorNode) void BrightnessNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) { BrightnessOperation *operation = new BrightnessOperation(); - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0),true, 0, graph); - this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1),true, 1, graph); - this->getInputSocket(2)->relinkConnections(operation->getInputSocket(2),true, 2, graph); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph); + this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph); + this->getInputSocket(2)->relinkConnections(operation->getInputSocket(2), 2, graph); this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0)); graph->addOperation(operation); } diff --git a/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp b/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp index 08980de8d98..dbe5b9936dc 100644 --- a/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp +++ b/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp @@ -64,13 +64,13 @@ void ChannelMatteNode::convertToOperations(ExecutionSystem *graph, CompositorCon SetAlphaOperation *operationAlpha = new SetAlphaOperation(); if (convert) { - inputSocketImage->relinkConnections(convert->getInputSocket(0), true, 0, graph); + inputSocketImage->relinkConnections(convert->getInputSocket(0), 0, graph); addLink(graph, convert->getOutputSocket(), operation->getInputSocket(0)); addLink(graph, convert->getInputSocket(0)->getConnection()->getFromSocket(), operationAlpha->getInputSocket(0)); graph->addOperation(convert); } else { - inputSocketImage->relinkConnections(operation->getInputSocket(0), true, 0, graph); + inputSocketImage->relinkConnections(operation->getInputSocket(0), 0, graph); addLink(graph, operation->getInputSocket(0)->getConnection()->getFromSocket(), operationAlpha->getInputSocket(0)); } diff --git a/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp b/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp index 45176cb007c..dd3b3855e3f 100644 --- a/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp +++ b/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp @@ -44,8 +44,8 @@ void ChromaMatteNode::convertToOperations(ExecutionSystem *graph, CompositorCont bNode *editorsnode = getbNode(); operation->setSettings((NodeChroma*)editorsnode->storage); - inputSocketImage->relinkConnections(operationRGBToYCC_Image->getInputSocket(0), true, 0, graph); - inputSocketKey->relinkConnections(operationRGBToYCC_Key->getInputSocket(0), true, 0, graph); + inputSocketImage->relinkConnections(operationRGBToYCC_Image->getInputSocket(0), 0, graph); + inputSocketKey->relinkConnections(operationRGBToYCC_Key->getInputSocket(0), 0, graph); addLink(graph, operationRGBToYCC_Image->getOutputSocket(), operation->getInputSocket(0)); addLink(graph, operationRGBToYCC_Key->getOutputSocket(), operation->getInputSocket(1)); diff --git a/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp b/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp index 32c9e50874e..7b852678191 100644 --- a/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp +++ b/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp @@ -63,8 +63,8 @@ void ColorBalanceNode::convertToOperations(ExecutionSystem *graph, CompositorCon operation = operationCDL; } - inputSocket->relinkConnections(operation->getInputSocket(0), true, 0, graph); - inputImageSocket->relinkConnections(operation->getInputSocket(1), true, 0, graph); + inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph); + inputImageSocket->relinkConnections(operation->getInputSocket(1), 0, graph); outputSocket->relinkConnections(operation->getOutputSocket(0)); graph->addOperation(operation); } diff --git a/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp b/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp index 995d66fcf23..4909f1b9895 100644 --- a/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp +++ b/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp @@ -33,8 +33,8 @@ void ColorCorrectionNode::convertToOperations(ExecutionSystem *graph, Compositor { ColorCorrectionOperation *operation = new ColorCorrectionOperation(); bNode *editorNode = getbNode(); - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0),true, 0, graph); - this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1),true, 1, graph); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph); + this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph); this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0)); operation->setData((NodeColorCorrection*)editorNode->storage); operation->setRedChannelEnabled((editorNode->custom1&1)>0); diff --git a/source/blender/compositor/nodes/COM_ColorCurveNode.cpp b/source/blender/compositor/nodes/COM_ColorCurveNode.cpp index a96fdf72b11..d7cde21a984 100644 --- a/source/blender/compositor/nodes/COM_ColorCurveNode.cpp +++ b/source/blender/compositor/nodes/COM_ColorCurveNode.cpp @@ -33,10 +33,10 @@ void ColorCurveNode::convertToOperations(ExecutionSystem *graph, CompositorConte { ColorCurveOperation *operation = new ColorCurveOperation(); - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, graph); - this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), true, 1, graph); - this->getInputSocket(2)->relinkConnections(operation->getInputSocket(2), true, 2, graph); - this->getInputSocket(3)->relinkConnections(operation->getInputSocket(3), true, 3, graph); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph); + this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph); + this->getInputSocket(2)->relinkConnections(operation->getInputSocket(2), 2, graph); + this->getInputSocket(3)->relinkConnections(operation->getInputSocket(3), 3, graph); this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket()); diff --git a/source/blender/compositor/nodes/COM_ColorMatteNode.cpp b/source/blender/compositor/nodes/COM_ColorMatteNode.cpp index e5231a48e05..860d1a01194 100644 --- a/source/blender/compositor/nodes/COM_ColorMatteNode.cpp +++ b/source/blender/compositor/nodes/COM_ColorMatteNode.cpp @@ -42,8 +42,8 @@ void ColorMatteNode::convertToOperations(ExecutionSystem *graph, CompositorConte bNode *editorsnode = getbNode(); operation->setSettings((NodeChroma*)editorsnode->storage); - inputSocketImage->relinkConnections(operationRGBToHSV_Image->getInputSocket(0), true, 0, graph); - inputSocketKey->relinkConnections(operationRGBToHSV_Key->getInputSocket(0), true, 1, graph); + inputSocketImage->relinkConnections(operationRGBToHSV_Image->getInputSocket(0), 0, graph); + inputSocketKey->relinkConnections(operationRGBToHSV_Key->getInputSocket(0), 1, graph); addLink(graph, operationRGBToHSV_Image->getOutputSocket(), operation->getInputSocket(0)); addLink(graph, operationRGBToHSV_Key->getOutputSocket(), operation->getInputSocket(1)); diff --git a/source/blender/compositor/nodes/COM_ColorRampNode.cpp b/source/blender/compositor/nodes/COM_ColorRampNode.cpp index 1873cad5d57..c6090120467 100644 --- a/source/blender/compositor/nodes/COM_ColorRampNode.cpp +++ b/source/blender/compositor/nodes/COM_ColorRampNode.cpp @@ -47,6 +47,6 @@ void ColorRampNode::convertToOperations(ExecutionSystem *graph, CompositorContex graph->addOperation(operation2); } operation->setColorBand((ColorBand*)editorNode->storage); - inputSocket->relinkConnections(operation->getInputSocket(0), true, 0, graph); + inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph); graph->addOperation(operation); } diff --git a/source/blender/compositor/nodes/COM_ColorSpillNode.cpp b/source/blender/compositor/nodes/COM_ColorSpillNode.cpp index 88043653b4f..503ca3c8bd3 100644 --- a/source/blender/compositor/nodes/COM_ColorSpillNode.cpp +++ b/source/blender/compositor/nodes/COM_ColorSpillNode.cpp @@ -49,8 +49,8 @@ void ColorSpillNode::convertToOperations(ExecutionSystem *graph, CompositorConte operation->setSpillChannel(editorsnode->custom1-1); // Channel for spilling - inputSocketImage->relinkConnections(operation->getInputSocket(0), true, 0, graph); - inputSocketFac->relinkConnections(operation->getInputSocket(1), true, 1, graph); + inputSocketImage->relinkConnections(operation->getInputSocket(0), 0, graph); + inputSocketFac->relinkConnections(operation->getInputSocket(1), 1, graph); outputSocketImage->relinkConnections(operation->getOutputSocket()); graph->addOperation(operation); diff --git a/source/blender/compositor/nodes/COM_ColorToBWNode.cpp b/source/blender/compositor/nodes/COM_ColorToBWNode.cpp index 7ff7ee1c13e..ed2869d35f2 100644 --- a/source/blender/compositor/nodes/COM_ColorToBWNode.cpp +++ b/source/blender/compositor/nodes/COM_ColorToBWNode.cpp @@ -35,7 +35,7 @@ void ColourToBWNode::convertToOperations(ExecutionSystem *graph, CompositorConte OutputSocket *valueSocket = this->getOutputSocket(0); ConvertColorToBWOperation *convertProg = new ConvertColorToBWOperation(); - colourSocket->relinkConnections(convertProg->getInputSocket(0), true, 0, graph); + colourSocket->relinkConnections(convertProg->getInputSocket(0), 0, graph); valueSocket->relinkConnections(convertProg->getOutputSocket(0)); graph->addOperation(convertProg); } diff --git a/source/blender/compositor/nodes/COM_CombineRGBANode.cpp b/source/blender/compositor/nodes/COM_CombineRGBANode.cpp index d5fef1e756a..e6fcc48ac5b 100644 --- a/source/blender/compositor/nodes/COM_CombineRGBANode.cpp +++ b/source/blender/compositor/nodes/COM_CombineRGBANode.cpp @@ -55,10 +55,10 @@ void CombineRGBANode::convertToOperations(ExecutionSystem *graph, CompositorCont else { operation->setResolutionInputSocketIndex(3); } - inputRSocket->relinkConnections(operation->getInputSocket(0), true, 0, graph); - inputGSocket->relinkConnections(operation->getInputSocket(1), true, 1, graph); - inputBSocket->relinkConnections(operation->getInputSocket(2), true, 2, graph); - inputASocket->relinkConnections(operation->getInputSocket(3), true, 3, graph); + inputRSocket->relinkConnections(operation->getInputSocket(0), 0, graph); + inputGSocket->relinkConnections(operation->getInputSocket(1), 1, graph); + inputBSocket->relinkConnections(operation->getInputSocket(2), 2, graph); + inputASocket->relinkConnections(operation->getInputSocket(3), 3, graph); outputSocket->relinkConnections(operation->getOutputSocket(0)); graph->addOperation(operation); } diff --git a/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp b/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp index 94139c132fb..0b4326a17ca 100644 --- a/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp +++ b/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp @@ -37,7 +37,7 @@ void ConvertAlphaNode::convertToOperations(ExecutionSystem *graph, CompositorCon operation = new ConvertKeyToPremulOperation(); } - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, graph); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph); this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket()); graph->addOperation(operation); diff --git a/source/blender/compositor/nodes/COM_CropNode.cpp b/source/blender/compositor/nodes/COM_CropNode.cpp index 52329be3034..c58fcc874cb 100644 --- a/source/blender/compositor/nodes/COM_CropNode.cpp +++ b/source/blender/compositor/nodes/COM_CropNode.cpp @@ -43,7 +43,7 @@ void CropNode::convertToOperations(ExecutionSystem *graph, CompositorContext * c } operation->setCropSettings(cropSettings); operation->setRelative(relative); - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, graph); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph); this->getOutputSocket()->relinkConnections(operation->getOutputSocket()); graph->addOperation(operation); } diff --git a/source/blender/compositor/nodes/COM_DefocusNode.cpp b/source/blender/compositor/nodes/COM_DefocusNode.cpp index 77f7baaef98..e4e19fdbe27 100644 --- a/source/blender/compositor/nodes/COM_DefocusNode.cpp +++ b/source/blender/compositor/nodes/COM_DefocusNode.cpp @@ -52,7 +52,7 @@ void DefocusNode::convertToOperations(ExecutionSystem *graph, CompositorContext SetValueOperation *maxRadius = new SetValueOperation(); maxRadius->setValue(data->maxblur); MathMinimumOperation *minimize = new MathMinimumOperation(); - this->getInputSocket(1)->relinkConnections(multiply->getInputSocket(0), true, 1, graph); + this->getInputSocket(1)->relinkConnections(multiply->getInputSocket(0), 1, graph); addLink(graph, multiplier->getOutputSocket(), multiply->getInputSocket(1)); addLink(graph, maxRadius->getOutputSocket(), minimize->getInputSocket(1)); addLink(graph, multiply->getOutputSocket(), minimize->getInputSocket(0)); @@ -68,7 +68,7 @@ void DefocusNode::convertToOperations(ExecutionSystem *graph, CompositorContext converter->setCameraObject(camob); converter->setfStop(data->fstop); converter->setMaxRadius(data->maxblur); - this->getInputSocket(1)->relinkConnections(converter->getInputSocket(0), true, 1, graph); + this->getInputSocket(1)->relinkConnections(converter->getInputSocket(0), 1, graph); graph->addOperation(converter); radiusOperation = converter; } @@ -98,7 +98,7 @@ void DefocusNode::convertToOperations(ExecutionSystem *graph, CompositorContext if (data->gamco) { GammaCorrectOperation * correct = new GammaCorrectOperation(); GammaUncorrectOperation * inverse = new GammaUncorrectOperation(); - this->getInputSocket(0)->relinkConnections(correct->getInputSocket(0), 0, true, graph); + this->getInputSocket(0)->relinkConnections(correct->getInputSocket(0), 0, graph); addLink(graph, correct->getOutputSocket(), operation->getInputSocket(0)); addLink(graph, operation->getOutputSocket(), inverse->getInputSocket(0)); this->getOutputSocket()->relinkConnections(inverse->getOutputSocket()); @@ -106,7 +106,7 @@ void DefocusNode::convertToOperations(ExecutionSystem *graph, CompositorContext graph->addOperation(inverse); } else { - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, true, graph); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph); this->getOutputSocket()->relinkConnections(operation->getOutputSocket()); } diff --git a/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp b/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp index ab6917f3a59..c26fb4e5c5d 100644 --- a/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp +++ b/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp @@ -38,8 +38,8 @@ void DifferenceMatteNode::convertToOperations(ExecutionSystem *graph, Compositor DifferenceMatteOperation * operationSet = new DifferenceMatteOperation(); operationSet->setSettings((NodeChroma*)editorNode->storage); - inputSocket->relinkConnections(operationSet->getInputSocket(0), true, 0, graph); - inputSocket2->relinkConnections(operationSet->getInputSocket(1), true, 1, graph); + inputSocket->relinkConnections(operationSet->getInputSocket(0), 0, graph); + inputSocket2->relinkConnections(operationSet->getInputSocket(1), 1, graph); outputSocketMatte->relinkConnections(operationSet->getOutputSocket(0)); graph->addOperation(operationSet); diff --git a/source/blender/compositor/nodes/COM_DilateErodeNode.cpp b/source/blender/compositor/nodes/COM_DilateErodeNode.cpp index 8f53c1ff8cc..cc96f672ebd 100644 --- a/source/blender/compositor/nodes/COM_DilateErodeNode.cpp +++ b/source/blender/compositor/nodes/COM_DilateErodeNode.cpp @@ -40,7 +40,7 @@ void DilateErodeNode::convertToOperations(ExecutionSystem *graph, CompositorCont operation->setDistance(editorNode->custom2); operation->setInset(editorNode->custom3); - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0)); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph); if (editorNode->custom3 < 2.0f) { AntiAliasOperation * antiAlias = new AntiAliasOperation(); @@ -57,14 +57,14 @@ void DilateErodeNode::convertToOperations(ExecutionSystem *graph, CompositorCont if (editorNode->custom2 > 0) { DilateStepOperation * operation = new DilateStepOperation(); operation->setIterations(editorNode->custom2); - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0)); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph); this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0)); graph->addOperation(operation); } else { ErodeStepOperation * operation = new ErodeStepOperation(); operation->setIterations(-editorNode->custom2); - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0)); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph); this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0)); graph->addOperation(operation); } diff --git a/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp b/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp index cefeffcfc07..d63fbbdb092 100644 --- a/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp +++ b/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp @@ -36,7 +36,7 @@ void DirectionalBlurNode::convertToOperations(ExecutionSystem *graph, Compositor DirectionalBlurOperation *operation = new DirectionalBlurOperation(); operation->setQuality(context->getQuality()); operation->setData(data); - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, graph); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph); this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket()); graph->addOperation(operation); } diff --git a/source/blender/compositor/nodes/COM_DisplaceNode.cpp b/source/blender/compositor/nodes/COM_DisplaceNode.cpp index 5fe9591bfd4..9604db378bc 100644 --- a/source/blender/compositor/nodes/COM_DisplaceNode.cpp +++ b/source/blender/compositor/nodes/COM_DisplaceNode.cpp @@ -36,10 +36,10 @@ void DisplaceNode::convertToOperations(ExecutionSystem *graph, CompositorContext else operation = new DisplaceOperation(); - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, graph); - this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), true, 1, graph); - this->getInputSocket(2)->relinkConnections(operation->getInputSocket(2), true, 2, graph); - this->getInputSocket(3)->relinkConnections(operation->getInputSocket(3), true, 3, graph); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph); + this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph); + this->getInputSocket(2)->relinkConnections(operation->getInputSocket(2), 2, graph); + this->getInputSocket(3)->relinkConnections(operation->getInputSocket(3), 3, graph); this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket()); graph->addOperation(operation); diff --git a/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp b/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp index 3fc4a882eaf..d7b4e481ec2 100644 --- a/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp +++ b/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp @@ -38,8 +38,8 @@ void DistanceMatteNode::convertToOperations(ExecutionSystem *graph, CompositorCo bNode *editorsnode = getbNode(); operation->setSettings((NodeChroma*)editorsnode->storage); - inputSocketImage->relinkConnections(operation->getInputSocket(0), true, 0, graph); - inputSocketKey->relinkConnections(operation->getInputSocket(1), true, 1, graph); + inputSocketImage->relinkConnections(operation->getInputSocket(0), 0, graph); + inputSocketKey->relinkConnections(operation->getInputSocket(1), 1, graph); if (outputSocketMatte->isConnected()) { outputSocketMatte->relinkConnections(operation->getOutputSocket()); diff --git a/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp b/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp index 1ac273a52cb..ab9e101dad8 100644 --- a/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp +++ b/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp @@ -38,8 +38,8 @@ void DoubleEdgeMaskNode::convertToOperations(ExecutionSystem *system, Compositor operation->setAdjecentOnly(bnode->custom1); operation->setKeepInside(bnode->custom2); - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, system); - this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), true, 1, system); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, system); + this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, system); this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0)); system->addOperation(operation); } diff --git a/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp b/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp index 7e327a306b6..f5003c4be94 100644 --- a/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp +++ b/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp @@ -34,8 +34,8 @@ void EllipseMaskNode::convertToOperations(ExecutionSystem *graph, CompositorCont EllipseMaskOperation *operation; operation = new EllipseMaskOperation(); operation->setData((NodeEllipseMask*)this->getbNode()->storage); - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, graph); - this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), true, 1, graph); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph); + this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph); this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0)); operation->setMaskType(this->getbNode()->custom1); diff --git a/source/blender/compositor/nodes/COM_FilterNode.cpp b/source/blender/compositor/nodes/COM_FilterNode.cpp index a1d405c0dff..bdba69dc47d 100644 --- a/source/blender/compositor/nodes/COM_FilterNode.cpp +++ b/source/blender/compositor/nodes/COM_FilterNode.cpp @@ -73,8 +73,8 @@ void FilterNode::convertToOperations(ExecutionSystem *graph, CompositorContext * break; } - inputImageSocket->relinkConnections(operation->getInputSocket(0), true, 1, graph); - inputSocket->relinkConnections(operation->getInputSocket(1), true, 0, graph); + inputImageSocket->relinkConnections(operation->getInputSocket(0), 1, graph); + inputSocket->relinkConnections(operation->getInputSocket(1), 0, graph); outputSocket->relinkConnections(operation->getOutputSocket()); addPreviewOperation(graph, operation->getOutputSocket(0), 5); diff --git a/source/blender/compositor/nodes/COM_FlipNode.cpp b/source/blender/compositor/nodes/COM_FlipNode.cpp index a4924aaae40..0830c757833 100644 --- a/source/blender/compositor/nodes/COM_FlipNode.cpp +++ b/source/blender/compositor/nodes/COM_FlipNode.cpp @@ -49,7 +49,7 @@ void FlipNode::convertToOperations(ExecutionSystem *graph, CompositorContext * c break; } - inputSocket->relinkConnections(operation->getInputSocket(0), true, 0, graph); + inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph); outputSocket->relinkConnections(operation->getOutputSocket(0)); graph->addOperation(operation); } diff --git a/source/blender/compositor/nodes/COM_GammaNode.cpp b/source/blender/compositor/nodes/COM_GammaNode.cpp index e5391e54e72..58b05607618 100644 --- a/source/blender/compositor/nodes/COM_GammaNode.cpp +++ b/source/blender/compositor/nodes/COM_GammaNode.cpp @@ -33,8 +33,8 @@ void GammaNode::convertToOperations(ExecutionSystem *graph, CompositorContext * { GammaOperation *operation = new GammaOperation(); - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, graph); - this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), true, 1, graph); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph); + this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph); this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0)); graph->addOperation(operation); } diff --git a/source/blender/compositor/nodes/COM_GlareNode.cpp b/source/blender/compositor/nodes/COM_GlareNode.cpp index e882c16814a..9382e726d76 100644 --- a/source/blender/compositor/nodes/COM_GlareNode.cpp +++ b/source/blender/compositor/nodes/COM_GlareNode.cpp @@ -49,7 +49,7 @@ void GlareNode::convertToOperations(ExecutionSystem *system, CompositorContext * SetValueOperation * mixvalueoperation = new SetValueOperation(); MixBlendOperation * mixoperation = new MixBlendOperation(); - this->getInputSocket(0)->relinkConnections(thresholdOperation->getInputSocket(0), true, 0, system); + this->getInputSocket(0)->relinkConnections(thresholdOperation->getInputSocket(0), 0, system); addLink(system, thresholdOperation->getOutputSocket(), glareoperation->getInputSocket(0)); addLink(system, mixvalueoperation->getOutputSocket(), mixoperation->getInputSocket(0)); addLink(system, glareoperation->getOutputSocket(), mixoperation->getInputSocket(2)); @@ -75,7 +75,7 @@ void GlareNode::convertToOperations(ExecutionSystem *system, CompositorContext * SetValueOperation * mixvalueoperation = new SetValueOperation(); MixBlendOperation * mixoperation = new MixBlendOperation(); mixoperation->setResolutionInputSocketIndex(1); - this->getInputSocket(0)->relinkConnections(thresholdOperation->getInputSocket(0), true, 0, system); + this->getInputSocket(0)->relinkConnections(thresholdOperation->getInputSocket(0), 0, system); addLink(system, thresholdOperation->getOutputSocket(), bluroperation->getInputSocket(0)); addLink(system, valueoperation->getOutputSocket(), bluroperation->getInputSocket(1)); addLink(system, mixvalueoperation->getOutputSocket(), mixoperation->getInputSocket(0)); @@ -109,7 +109,7 @@ void GlareNode::convertToOperations(ExecutionSystem *system, CompositorContext * SetValueOperation * mixvalueoperation = new SetValueOperation(); MixBlendOperation * mixoperation = new MixBlendOperation(); - this->getInputSocket(0)->relinkConnections(thresholdOperation->getInputSocket(0), true, 0, system); + this->getInputSocket(0)->relinkConnections(thresholdOperation->getInputSocket(0), 0, system); addLink(system, thresholdOperation->getOutputSocket(), glareoperation->getInputSocket(0)); addLink(system, mixvalueoperation->getOutputSocket(), mixoperation->getInputSocket(0)); addLink(system, glareoperation->getOutputSocket(), mixoperation->getInputSocket(2)); diff --git a/source/blender/compositor/nodes/COM_GroupNode.cpp b/source/blender/compositor/nodes/COM_GroupNode.cpp index 67e829a5cf6..076d4f1501a 100644 --- a/source/blender/compositor/nodes/COM_GroupNode.cpp +++ b/source/blender/compositor/nodes/COM_GroupNode.cpp @@ -47,12 +47,12 @@ void GroupNode::ungroup(ExecutionSystem &system) if (editorInput->groupsock) { if (inputSocket->isConnected()) { SocketProxyNode * proxy = new SocketProxyNode(this->getbNode(), editorInput, editorInput->groupsock); - inputSocket->relinkConnections(proxy->getInputSocket(0), true, index, &system); + inputSocket->relinkConnections(proxy->getInputSocket(0), index, &system); ExecutionSystemHelper::addNode(system.getNodes(), proxy); } else { OutputSocketProxyNode * proxy = new OutputSocketProxyNode(this->getbNode(), editorInput, editorInput->groupsock); - inputSocket->relinkConnections(proxy->getInputSocket(0), true, index, &system); + inputSocket->relinkConnections(proxy->getInputSocket(0), index, &system); ExecutionSystemHelper::addNode(system.getNodes(), proxy); } } diff --git a/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp b/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp index 80c786ef6d7..ae96a8c9fb8 100644 --- a/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp +++ b/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp @@ -51,12 +51,12 @@ void HueSaturationValueCorrectNode::convertToOperations(ExecutionSystem *graph, HueSaturationValueCorrectOperation *changeHSV = new HueSaturationValueCorrectOperation(); MixBlendOperation * blend = new MixBlendOperation(); - colourSocket->relinkConnections(rgbToHSV->getInputSocket(0), true, 0, graph); + colourSocket->relinkConnections(rgbToHSV->getInputSocket(0), 1, graph); addLink(graph, rgbToHSV->getOutputSocket(), changeHSV->getInputSocket(0)); addLink(graph, changeHSV->getOutputSocket(), hsvToRGB->getInputSocket(0)); addLink(graph, hsvToRGB->getOutputSocket(), blend->getInputSocket(2)); addLink(graph, rgbToHSV->getInputSocket(0)->getConnection()->getFromSocket(), blend->getInputSocket(1)); - valueSocket->relinkConnections(blend->getInputSocket(0), true, 0, graph); + valueSocket->relinkConnections(blend->getInputSocket(0), 0, graph); outputSocket->relinkConnections(blend->getOutputSocket()); changeHSV->setCurveMapping(storage); diff --git a/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp b/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp index d78592884c6..32c7d4719a4 100644 --- a/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp +++ b/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp @@ -49,12 +49,12 @@ void HueSaturationValueNode::convertToOperations(ExecutionSystem *graph, Composi ChangeHSVOperation *changeHSV = new ChangeHSVOperation(); MixBlendOperation * blend = new MixBlendOperation(); - colourSocket->relinkConnections(rgbToHSV->getInputSocket(0), true, 0, graph); + colourSocket->relinkConnections(rgbToHSV->getInputSocket(0), 0, graph); addLink(graph, rgbToHSV->getOutputSocket(), changeHSV->getInputSocket(0)); addLink(graph, changeHSV->getOutputSocket(), hsvToRGB->getInputSocket(0)); addLink(graph, hsvToRGB->getOutputSocket(), blend->getInputSocket(2)); addLink(graph, rgbToHSV->getInputSocket(0)->getConnection()->getFromSocket(), blend->getInputSocket(1)); - valueSocket->relinkConnections(blend->getInputSocket(0), true, 0, graph); + valueSocket->relinkConnections(blend->getInputSocket(0), 0, graph); outputSocket->relinkConnections(blend->getOutputSocket()); changeHSV->setHue(storage->hue); diff --git a/source/blender/compositor/nodes/COM_IDMaskNode.cpp b/source/blender/compositor/nodes/COM_IDMaskNode.cpp index ea9e279009c..82d3ae8ca29 100644 --- a/source/blender/compositor/nodes/COM_IDMaskNode.cpp +++ b/source/blender/compositor/nodes/COM_IDMaskNode.cpp @@ -36,7 +36,7 @@ void IDMaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext * operation = new IDMaskOperation(); operation->setObjectIndex(bnode->custom1); - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0)); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph); if (bnode->custom2==0 || context->getScene()->r.scemode & R_FULL_SAMPLE) { this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0)); } diff --git a/source/blender/compositor/nodes/COM_InvertNode.cpp b/source/blender/compositor/nodes/COM_InvertNode.cpp index 616a63ae948..5d039239fbe 100644 --- a/source/blender/compositor/nodes/COM_InvertNode.cpp +++ b/source/blender/compositor/nodes/COM_InvertNode.cpp @@ -37,8 +37,8 @@ void InvertNode::convertToOperations(ExecutionSystem *graph, CompositorContext * operation->setColor(node->custom1 & CMP_CHAN_RGB); operation->setAlpha(node->custom1 & CMP_CHAN_A); - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0),true, 0, graph); - this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1),true, 1, graph); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph); + this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph); this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0)); graph->addOperation(operation); } diff --git a/source/blender/compositor/nodes/COM_LensDistortionNode.cpp b/source/blender/compositor/nodes/COM_LensDistortionNode.cpp index 5719f31180b..e55dd5e64d8 100644 --- a/source/blender/compositor/nodes/COM_LensDistortionNode.cpp +++ b/source/blender/compositor/nodes/COM_LensDistortionNode.cpp @@ -37,7 +37,7 @@ void LensDistortionNode::convertToOperations(ExecutionSystem *graph, CompositorC if (data->proj) { ProjectorLensDistortionOperation *operation = new ProjectorLensDistortionOperation(); - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, graph); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph); operation->setDispertion(this->getInputSocket(2)->getStaticValues()[0]); this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0)); @@ -48,7 +48,7 @@ void LensDistortionNode::convertToOperations(ExecutionSystem *graph, CompositorC else { ScreenLensDistortionOperation *operation = new ScreenLensDistortionOperation(); - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, graph); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph); operation->setDistortion(this->getInputSocket(1)->getStaticValues()[0]); operation->setDispertion(this->getInputSocket(2)->getStaticValues()[0]); this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0)); diff --git a/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp b/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp index 8c9ebeed1cf..eb78657f3c4 100644 --- a/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp +++ b/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp @@ -39,7 +39,7 @@ void LuminanceMatteNode::convertToOperations(ExecutionSystem *graph, CompositorC bNode *editorsnode = getbNode(); operationSet->setSettings((NodeChroma*)editorsnode->storage); - inputSocket->relinkConnections(rgbToYUV->getInputSocket(0), true, 0, graph); + inputSocket->relinkConnections(rgbToYUV->getInputSocket(0), 0, graph); addLink(graph, rgbToYUV->getOutputSocket(), operationSet->getInputSocket(0)); if (outputSocketMatte->isConnected()) { diff --git a/source/blender/compositor/nodes/COM_MapUVNode.cpp b/source/blender/compositor/nodes/COM_MapUVNode.cpp index 32db5ac13a8..e0e7e2594ed 100644 --- a/source/blender/compositor/nodes/COM_MapUVNode.cpp +++ b/source/blender/compositor/nodes/COM_MapUVNode.cpp @@ -31,8 +31,8 @@ void MapUVNode::convertToOperations(ExecutionSystem *graph, CompositorContext * { MapUVOperation *operation = new MapUVOperation(); - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, graph); - this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), true, 1, graph); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph); + this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph); this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket()); bNode *node = this->getbNode(); diff --git a/source/blender/compositor/nodes/COM_MapValueNode.cpp b/source/blender/compositor/nodes/COM_MapValueNode.cpp index 4ca93113dd5..f56662b1d64 100644 --- a/source/blender/compositor/nodes/COM_MapValueNode.cpp +++ b/source/blender/compositor/nodes/COM_MapValueNode.cpp @@ -36,7 +36,7 @@ void MapValueNode::convertToOperations(ExecutionSystem *graph, CompositorContext TexMapping *storage = (TexMapping*)this->getbNode()->storage; MapValueOperation *convertProg = new MapValueOperation(); convertProg->setSettings(storage); - colourSocket->relinkConnections(convertProg->getInputSocket(0), true, 0, graph); + colourSocket->relinkConnections(convertProg->getInputSocket(0), 0, graph); valueSocket->relinkConnections(convertProg->getOutputSocket(0)); graph->addOperation(convertProg); } diff --git a/source/blender/compositor/nodes/COM_MathNode.cpp b/source/blender/compositor/nodes/COM_MathNode.cpp index a5c4aa01721..eabd0481e38 100644 --- a/source/blender/compositor/nodes/COM_MathNode.cpp +++ b/source/blender/compositor/nodes/COM_MathNode.cpp @@ -84,8 +84,8 @@ void MathNode::convertToOperations(ExecutionSystem *graph, CompositorContext * c } if (operation != NULL) { - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, graph); - this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), true, 1, graph); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph); + this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph); this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket()); graph->addOperation(operation); diff --git a/source/blender/compositor/nodes/COM_MixNode.cpp b/source/blender/compositor/nodes/COM_MixNode.cpp index 63ab83834f2..86ca5ebc237 100644 --- a/source/blender/compositor/nodes/COM_MixNode.cpp +++ b/source/blender/compositor/nodes/COM_MixNode.cpp @@ -121,9 +121,9 @@ void MixNode::convertToOperations(ExecutionSystem *graph, CompositorContext * co } convertProg->setUseValueAlphaMultiply(this->getbNode()->custom2); - valueSocket->relinkConnections(convertProg->getInputSocket(0), true, 0, graph); - color1Socket->relinkConnections(convertProg->getInputSocket(1), true, 1, graph); - color2Socket->relinkConnections(convertProg->getInputSocket(2), true, 2, graph); + valueSocket->relinkConnections(convertProg->getInputSocket(0), 0, graph); + color1Socket->relinkConnections(convertProg->getInputSocket(1), 1, graph); + color2Socket->relinkConnections(convertProg->getInputSocket(2), 2, graph); outputSocket->relinkConnections(convertProg->getOutputSocket(0)); addPreviewOperation(graph, convertProg->getOutputSocket(0), 5); diff --git a/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp b/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp index 55e51baf7da..bdf4c53fa72 100644 --- a/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp +++ b/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp @@ -41,7 +41,7 @@ void MovieDistortionNode::convertToOperations(ExecutionSystem *system, Composito operation->setMovieClip(clip); operation->setFramenumber(context->getFramenumber()); - inputSocket->relinkConnections(operation->getInputSocket(0), true, 0, system); + inputSocket->relinkConnections(operation->getInputSocket(0), 0, system); outputSocket->relinkConnections(operation->getOutputSocket(0)); system->addOperation(operation); } diff --git a/source/blender/compositor/nodes/COM_NormalNode.cpp b/source/blender/compositor/nodes/COM_NormalNode.cpp index 58b6ba1f410..0b1faafe302 100644 --- a/source/blender/compositor/nodes/COM_NormalNode.cpp +++ b/source/blender/compositor/nodes/COM_NormalNode.cpp @@ -50,7 +50,7 @@ void NormalNode::convertToOperations(ExecutionSystem *graph, CompositorContext * if (outputSocketDotproduct->isConnected()) { DotproductOperation *operation = new DotproductOperation(); outputSocketDotproduct->relinkConnections(operation->getOutputSocket(0)); - inputSocket->relinkConnections(operation->getInputSocket(0), true, 0, graph); + inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph); addLink(graph, operationSet->getOutputSocket(0), operation->getInputSocket(1)); graph->addOperation(operation); } diff --git a/source/blender/compositor/nodes/COM_NormalizeNode.cpp b/source/blender/compositor/nodes/COM_NormalizeNode.cpp index f3fe8579a86..11173b3a73f 100644 --- a/source/blender/compositor/nodes/COM_NormalizeNode.cpp +++ b/source/blender/compositor/nodes/COM_NormalizeNode.cpp @@ -31,7 +31,7 @@ void NormalizeNode::convertToOperations(ExecutionSystem *graph, CompositorContex { NormalizeOperation *operation = new NormalizeOperation(); - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, graph); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph); this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0)); graph->addOperation(operation); diff --git a/source/blender/compositor/nodes/COM_RotateNode.cpp b/source/blender/compositor/nodes/COM_RotateNode.cpp index f5fdf19398d..48acc567739 100644 --- a/source/blender/compositor/nodes/COM_RotateNode.cpp +++ b/source/blender/compositor/nodes/COM_RotateNode.cpp @@ -53,8 +53,8 @@ void RotateNode::convertToOperations(ExecutionSystem *system, CompositorContext addLink(system, sampler->getOutputSocket(), operation->getInputSocket(0)); - inputSocket->relinkConnections(sampler->getInputSocket(0), true, 0, system); - inputDegreeSocket->relinkConnections(operation->getInputSocket(1), true, 1, system); + inputSocket->relinkConnections(sampler->getInputSocket(0), 0, system); + inputDegreeSocket->relinkConnections(operation->getInputSocket(1), 1, system); outputSocket->relinkConnections(operation->getOutputSocket(0)); system->addOperation(sampler); system->addOperation(operation); diff --git a/source/blender/compositor/nodes/COM_ScaleNode.cpp b/source/blender/compositor/nodes/COM_ScaleNode.cpp index fe5862da018..d709781299f 100644 --- a/source/blender/compositor/nodes/COM_ScaleNode.cpp +++ b/source/blender/compositor/nodes/COM_ScaleNode.cpp @@ -42,9 +42,9 @@ void ScaleNode::convertToOperations(ExecutionSystem *graph, CompositorContext * case CMP_SCALE_RELATIVE: { ScaleOperation *operation = new ScaleOperation(); - inputSocket->relinkConnections(operation->getInputSocket(0), true, 0, graph); - inputXSocket->relinkConnections(operation->getInputSocket(1), true, 1, graph); - inputYSocket->relinkConnections(operation->getInputSocket(2), true, 2, graph); + inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph); + inputXSocket->relinkConnections(operation->getInputSocket(1), 1, graph); + inputYSocket->relinkConnections(operation->getInputSocket(2), 2, graph); outputSocket->relinkConnections(operation->getOutputSocket(0)); graph->addOperation(operation); } @@ -53,7 +53,7 @@ void ScaleNode::convertToOperations(ExecutionSystem *graph, CompositorContext * SetValueOperation * scaleFactorOperation = new SetValueOperation(); scaleFactorOperation->setValue(context->getScene()->r.size/100.0f); ScaleOperation * operation = new ScaleOperation(); - inputSocket->relinkConnections(operation->getInputSocket(0), true, 0, graph); + inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph); addLink(graph, scaleFactorOperation->getOutputSocket(), operation->getInputSocket(1)); addLink(graph, scaleFactorOperation->getOutputSocket(), operation->getInputSocket(2)); outputSocket->relinkConnections(operation->getOutputSocket(0)); @@ -67,7 +67,7 @@ void ScaleNode::convertToOperations(ExecutionSystem *graph, CompositorContext * ScaleFixedSizeOperation * operation = new ScaleFixedSizeOperation(); operation->setNewWidth(data->xsch*data->size/100.0f); operation->setNewHeight(data->ysch*data->size/100.0f); - inputSocket->relinkConnections(operation->getInputSocket(0), true, 0, graph); + inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph); outputSocket->relinkConnections(operation->getOutputSocket(0)); operation->getInputSocket(0)->getConnection()->setIgnoreResizeCheck(true); graph->addOperation(operation); @@ -77,9 +77,9 @@ void ScaleNode::convertToOperations(ExecutionSystem *graph, CompositorContext * case CMP_SCALE_ABSOLUTE: { ScaleAbsoluteOperation *operation = new ScaleAbsoluteOperation(); // TODO: what is the use of this one.... perhaps some issues when the ui was updated.... - inputSocket->relinkConnections(operation->getInputSocket(0), true, 0, graph); - inputXSocket->relinkConnections(operation->getInputSocket(1), true, 1, graph); - inputYSocket->relinkConnections(operation->getInputSocket(2), true, 2, graph); + inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph); + inputXSocket->relinkConnections(operation->getInputSocket(1), 1, graph); + inputYSocket->relinkConnections(operation->getInputSocket(2), 2, graph); outputSocket->relinkConnections(operation->getOutputSocket(0)); graph->addOperation(operation); } diff --git a/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp b/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp index 7079762d465..dd154fe604d 100644 --- a/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp +++ b/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp @@ -44,28 +44,28 @@ void SeparateRGBANode::convertToOperations(ExecutionSystem *graph, CompositorCon if (outputRSocket->isConnected()) { SeparateChannelOperation *operation = new SeparateChannelOperation(); operation->setChannel(0); - imageSocket->relinkConnections(operation->getInputSocket(0), true, 0, true, graph); + imageSocket->relinkConnectionsDuplicate(operation->getInputSocket(0), 0, graph); outputRSocket->relinkConnections(operation->getOutputSocket(0)); graph->addOperation(operation); } if (outputGSocket->isConnected()) { SeparateChannelOperation *operation = new SeparateChannelOperation(); operation->setChannel(1); - imageSocket->relinkConnections(operation->getInputSocket(0), true, 0, true, graph); + imageSocket->relinkConnectionsDuplicate(operation->getInputSocket(0), 0, graph); outputGSocket->relinkConnections(operation->getOutputSocket(0)); graph->addOperation(operation); } if (outputBSocket->isConnected()) { SeparateChannelOperation *operation = new SeparateChannelOperation(); operation->setChannel(2); - imageSocket->relinkConnections(operation->getInputSocket(0), true, 0, true, graph); + imageSocket->relinkConnectionsDuplicate(operation->getInputSocket(0), 0, graph); outputBSocket->relinkConnections(operation->getOutputSocket(0)); graph->addOperation(operation); } if (outputASocket->isConnected()) { SeparateChannelOperation *operation = new SeparateChannelOperation(); operation->setChannel(3); - imageSocket->relinkConnections(operation->getInputSocket(0), true, 0, true, graph); + imageSocket->relinkConnectionsDuplicate(operation->getInputSocket(0), 0, graph); outputASocket->relinkConnections(operation->getOutputSocket(0)); graph->addOperation(operation); } diff --git a/source/blender/compositor/nodes/COM_SetAlphaNode.cpp b/source/blender/compositor/nodes/COM_SetAlphaNode.cpp index 90db6682184..1d09b81c4d2 100644 --- a/source/blender/compositor/nodes/COM_SetAlphaNode.cpp +++ b/source/blender/compositor/nodes/COM_SetAlphaNode.cpp @@ -28,8 +28,8 @@ void SetAlphaNode::convertToOperations(ExecutionSystem *graph, CompositorContext { SetAlphaOperation *operation = new SetAlphaOperation(); - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, graph); - this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), true, 0, graph); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph); + this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph); this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket()); graph->addOperation(operation); diff --git a/source/blender/compositor/nodes/COM_SplitViewerNode.cpp b/source/blender/compositor/nodes/COM_SplitViewerNode.cpp index d1a2cccf758..9f9efbd8fe5 100644 --- a/source/blender/compositor/nodes/COM_SplitViewerNode.cpp +++ b/source/blender/compositor/nodes/COM_SplitViewerNode.cpp @@ -43,8 +43,8 @@ void SplitViewerNode::convertToOperations(ExecutionSystem *graph, CompositorCont splitViewerOperation->setActive(this->getbNode()->flag & NODE_DO_OUTPUT); splitViewerOperation->setSplitPercentage(this->getbNode()->custom1); splitViewerOperation->setXSplit(!this->getbNode()->custom2); - image1Socket->relinkConnections(splitViewerOperation->getInputSocket(0), true, 1, graph); - image2Socket->relinkConnections(splitViewerOperation->getInputSocket(1), true, 1, graph); + image1Socket->relinkConnections(splitViewerOperation->getInputSocket(0), 0, graph); + image2Socket->relinkConnections(splitViewerOperation->getInputSocket(1), 1, graph); addPreviewOperation(graph, splitViewerOperation->getInputSocket(0), 0); graph->addOperation(splitViewerOperation); } diff --git a/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp b/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp index 047b4fa4bf6..7234e71a43c 100644 --- a/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp +++ b/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp @@ -65,7 +65,7 @@ void Stabilize2dNode::convertToOperations(ExecutionSystem *graph, CompositorCont yAttribute->setFramenumber(context->getFramenumber()); yAttribute->setMovieClip(clip); - imageInput->relinkConnections(scaleOperation->getInputSocket(0), true, 0, graph); + imageInput->relinkConnections(scaleOperation->getInputSocket(0), 0, graph); addLink(graph, scaleAttribute->getOutputSocket(), scaleOperation->getInputSocket(1)); addLink(graph, scaleAttribute->getOutputSocket(), scaleOperation->getInputSocket(2)); diff --git a/source/blender/compositor/nodes/COM_SwitchNode.cpp b/source/blender/compositor/nodes/COM_SwitchNode.cpp index c65d7fbdc61..58c60a96de8 100644 --- a/source/blender/compositor/nodes/COM_SwitchNode.cpp +++ b/source/blender/compositor/nodes/COM_SwitchNode.cpp @@ -35,10 +35,10 @@ void SwitchNode::convertToOperations(ExecutionSystem *graph, CompositorContext * int switchFrame = this->getbNode()->custom1; if (!switchFrame) { - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, graph); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph); } else { - this->getInputSocket(1)->relinkConnections(operation->getInputSocket(0), true, 1, graph); + this->getInputSocket(1)->relinkConnections(operation->getInputSocket(0), 1, graph); } this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket()); diff --git a/source/blender/compositor/nodes/COM_TextureNode.cpp b/source/blender/compositor/nodes/COM_TextureNode.cpp index 5e59d86e7d9..be8bb623f4c 100644 --- a/source/blender/compositor/nodes/COM_TextureNode.cpp +++ b/source/blender/compositor/nodes/COM_TextureNode.cpp @@ -34,8 +34,8 @@ void TextureNode::convertToOperations(ExecutionSystem *system, CompositorContext Tex *texture = (Tex*)editorNode->id; TextureOperation *operation = new TextureOperation(); this->getOutputSocket(1)->relinkConnections(operation->getOutputSocket()); - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, system); - this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), true, 1, system); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, system); + this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, system); operation->setTexture(texture); operation->setScene(context->getScene()); system->addOperation(operation); diff --git a/source/blender/compositor/nodes/COM_TonemapNode.cpp b/source/blender/compositor/nodes/COM_TonemapNode.cpp index 7e170ea1704..80f02f3edbb 100644 --- a/source/blender/compositor/nodes/COM_TonemapNode.cpp +++ b/source/blender/compositor/nodes/COM_TonemapNode.cpp @@ -35,7 +35,7 @@ void TonemapNode::convertToOperations(ExecutionSystem *system, CompositorContext TonemapOperation *operation = data->type==1?new PhotoreceptorTonemapOperation():new TonemapOperation(); operation->setData(data); - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, system); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, system); this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0)); system->addOperation(operation); } diff --git a/source/blender/compositor/nodes/COM_TransformNode.cpp b/source/blender/compositor/nodes/COM_TransformNode.cpp index 6762cb0687a..da3e85036a5 100644 --- a/source/blender/compositor/nodes/COM_TransformNode.cpp +++ b/source/blender/compositor/nodes/COM_TransformNode.cpp @@ -57,18 +57,18 @@ void TransformNode::convertToOperations(ExecutionSystem *graph, CompositorContex break; } - imageInput->relinkConnections(sampler->getInputSocket(0), true, 0, graph); + imageInput->relinkConnections(sampler->getInputSocket(0), 0, graph); addLink(graph, sampler->getOutputSocket(), scaleOperation->getInputSocket(0)); - scaleInput->relinkConnections(scaleOperation->getInputSocket(1), true, 4, graph); + scaleInput->relinkConnections(scaleOperation->getInputSocket(1), 4, graph); addLink(graph, scaleOperation->getInputSocket(1)->getConnection()->getFromSocket(), scaleOperation->getInputSocket(2)); // xscale = yscale addLink(graph, scaleOperation->getOutputSocket(), rotateOperation->getInputSocket(0)); rotateOperation->setDoDegree2RadConversion(false); - angleInput->relinkConnections(rotateOperation->getInputSocket(1), true, 3, graph); + angleInput->relinkConnections(rotateOperation->getInputSocket(1), 3, graph); addLink(graph, rotateOperation->getOutputSocket(), translateOperation->getInputSocket(0)); - xInput->relinkConnections(translateOperation->getInputSocket(1), true, 1, graph); - yInput->relinkConnections(translateOperation->getInputSocket(2), true, 2, graph); + xInput->relinkConnections(translateOperation->getInputSocket(1), 1, graph); + yInput->relinkConnections(translateOperation->getInputSocket(2), 2, graph); this->getOutputSocket()->relinkConnections(translateOperation->getOutputSocket()); diff --git a/source/blender/compositor/nodes/COM_TranslateNode.cpp b/source/blender/compositor/nodes/COM_TranslateNode.cpp index f594db3c160..407c6da4e4d 100644 --- a/source/blender/compositor/nodes/COM_TranslateNode.cpp +++ b/source/blender/compositor/nodes/COM_TranslateNode.cpp @@ -37,9 +37,9 @@ void TranslateNode::convertToOperations(ExecutionSystem *graph, CompositorContex OutputSocket *outputSocket = this->getOutputSocket(0); TranslateOperation *operation = new TranslateOperation(); - inputSocket->relinkConnections(operation->getInputSocket(0), true, 0, graph); - inputXSocket->relinkConnections(operation->getInputSocket(1), true, 1, graph); - inputYSocket->relinkConnections(operation->getInputSocket(2), true, 2, graph); + inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph); + inputXSocket->relinkConnections(operation->getInputSocket(1), 1, graph); + inputYSocket->relinkConnections(operation->getInputSocket(2), 2, graph); outputSocket->relinkConnections(operation->getOutputSocket(0)); graph->addOperation(operation); } diff --git a/source/blender/compositor/nodes/COM_VectorBlurNode.cpp b/source/blender/compositor/nodes/COM_VectorBlurNode.cpp index 4baa2315799..596256eb6af 100644 --- a/source/blender/compositor/nodes/COM_VectorBlurNode.cpp +++ b/source/blender/compositor/nodes/COM_VectorBlurNode.cpp @@ -39,9 +39,9 @@ void VectorBlurNode::convertToOperations(ExecutionSystem *system, CompositorCont VectorBlurOperation *operation = new VectorBlurOperation(); operation->setVectorBlurSettings(vectorBlurSettings); operation->setQuality(context->getQuality()); - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, system); - this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), true, 1, system); - this->getInputSocket(2)->relinkConnections(operation->getInputSocket(2), true, 2, system); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, system); + this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, system); + this->getInputSocket(2)->relinkConnections(operation->getInputSocket(2), 2, system); this->getOutputSocket()->relinkConnections(operation->getOutputSocket()); system->addOperation(operation); } diff --git a/source/blender/compositor/nodes/COM_VectorCurveNode.cpp b/source/blender/compositor/nodes/COM_VectorCurveNode.cpp index 2f216b5d5bd..908e1a19f16 100644 --- a/source/blender/compositor/nodes/COM_VectorCurveNode.cpp +++ b/source/blender/compositor/nodes/COM_VectorCurveNode.cpp @@ -33,7 +33,7 @@ void VectorCurveNode::convertToOperations(ExecutionSystem *graph, CompositorCont { VectorCurveOperation *operation = new VectorCurveOperation(); - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, graph); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph); this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket()); operation->setCurveMapping((CurveMapping*)this->getbNode()->storage); diff --git a/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp b/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp index 9aa922faa5d..cedf81e3f2a 100644 --- a/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp +++ b/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp @@ -41,7 +41,7 @@ void ViewLevelsNode::convertToOperations(ExecutionSystem *graph, CompositorConte if (socket->isConnected()) { // calculate mean operation CalculateMeanOperation * operation = new CalculateMeanOperation(); - input->relinkConnections(operation->getInputSocket(0), true, 0, graph); + input->relinkConnections(operation->getInputSocket(0), 0, graph); firstOperationConnected = true; operation->setSetting(this->getbNode()->custom1); socket->relinkConnections(operation->getOutputSocket()); @@ -56,7 +56,7 @@ void ViewLevelsNode::convertToOperations(ExecutionSystem *graph, CompositorConte addLink(graph, inputSocket, operation->getInputSocket(0)); } else { - input->relinkConnections(operation->getInputSocket(0), true, 0, graph); + input->relinkConnections(operation->getInputSocket(0), 0, graph); } operation->setSetting(this->getbNode()->custom1); socket->relinkConnections(operation->getOutputSocket()); diff --git a/source/blender/compositor/nodes/COM_ViewerNode.cpp b/source/blender/compositor/nodes/COM_ViewerNode.cpp index d518976143d..7609928bc15 100644 --- a/source/blender/compositor/nodes/COM_ViewerNode.cpp +++ b/source/blender/compositor/nodes/COM_ViewerNode.cpp @@ -48,7 +48,7 @@ void ViewerNode::convertToOperations(ExecutionSystem *graph, CompositorContext * viewerOperation->setChunkOrder((OrderOfChunks)editorNode->custom1); viewerOperation->setCenterX(editorNode->custom3); viewerOperation->setCenterY(editorNode->custom4); - imageSocket->relinkConnections(viewerOperation->getInputSocket(0), true, 0, graph); + imageSocket->relinkConnections(viewerOperation->getInputSocket(0), 0, graph); alphaSocket->relinkConnections(viewerOperation->getInputSocket(1)); graph->addOperation(viewerOperation); addPreviewOperation(graph, viewerOperation->getInputSocket(0), 0); diff --git a/source/blender/compositor/nodes/COM_ZCombineNode.cpp b/source/blender/compositor/nodes/COM_ZCombineNode.cpp index 25d9a6e97d2..2495d1a5ab2 100644 --- a/source/blender/compositor/nodes/COM_ZCombineNode.cpp +++ b/source/blender/compositor/nodes/COM_ZCombineNode.cpp @@ -41,10 +41,10 @@ void ZCombineNode::convertToOperations(ExecutionSystem *system, CompositorContex operation = new ZCombineOperation(); } - this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, system); - this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), true, 1, system); - this->getInputSocket(2)->relinkConnections(operation->getInputSocket(2), true, 2, system); - this->getInputSocket(3)->relinkConnections(operation->getInputSocket(3), true, 3, system); + this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, system); + this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, system); + this->getInputSocket(2)->relinkConnections(operation->getInputSocket(2), 2, system); + this->getInputSocket(3)->relinkConnections(operation->getInputSocket(3), 3, system); this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket()); system->addOperation(operation); if (this->getOutputSocket(1)->isConnected()) { @@ -58,8 +58,8 @@ void ZCombineNode::convertToOperations(ExecutionSystem *system, CompositorContex else { if (this->getOutputSocket(1)->isConnected()) { MathMinimumOperation * zoperation = new MathMinimumOperation(); - this->getInputSocket(1)->relinkConnections(zoperation->getInputSocket(0), true, 1, system); - this->getInputSocket(3)->relinkConnections(zoperation->getInputSocket(1), true, 3, system); + this->getInputSocket(1)->relinkConnections(zoperation->getInputSocket(0), 1, system); + this->getInputSocket(3)->relinkConnections(zoperation->getInputSocket(1), 3, system); this->getOutputSocket(1)->relinkConnections(zoperation->getOutputSocket()); system->addOperation(zoperation); } -- cgit v1.2.3