cleanup relink code
authorJeroen Bakker <j.bakker@atmind.nl>
Wed, 23 May 2012 12:45:07 +0000 (12:45 +0000)
committerJeroen Bakker <j.bakker@atmind.nl>
Wed, 23 May 2012 12:45:07 +0000 (12:45 +0000)
62 files changed:
source/blender/compositor/intern/COM_InputSocket.cpp
source/blender/compositor/intern/COM_InputSocket.h
source/blender/compositor/nodes/COM_AlphaOverNode.cpp
source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
source/blender/compositor/nodes/COM_BlurNode.cpp
source/blender/compositor/nodes/COM_BokehBlurNode.cpp
source/blender/compositor/nodes/COM_BoxMaskNode.cpp
source/blender/compositor/nodes/COM_BrightnessNode.cpp
source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp
source/blender/compositor/nodes/COM_ColorCurveNode.cpp
source/blender/compositor/nodes/COM_ColorMatteNode.cpp
source/blender/compositor/nodes/COM_ColorRampNode.cpp
source/blender/compositor/nodes/COM_ColorSpillNode.cpp
source/blender/compositor/nodes/COM_ColorToBWNode.cpp
source/blender/compositor/nodes/COM_CombineRGBANode.cpp
source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
source/blender/compositor/nodes/COM_CropNode.cpp
source/blender/compositor/nodes/COM_DefocusNode.cpp
source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp
source/blender/compositor/nodes/COM_DilateErodeNode.cpp
source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
source/blender/compositor/nodes/COM_DisplaceNode.cpp
source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp
source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
source/blender/compositor/nodes/COM_FilterNode.cpp
source/blender/compositor/nodes/COM_FlipNode.cpp
source/blender/compositor/nodes/COM_GammaNode.cpp
source/blender/compositor/nodes/COM_GlareNode.cpp
source/blender/compositor/nodes/COM_GroupNode.cpp
source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
source/blender/compositor/nodes/COM_IDMaskNode.cpp
source/blender/compositor/nodes/COM_InvertNode.cpp
source/blender/compositor/nodes/COM_LensDistortionNode.cpp
source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
source/blender/compositor/nodes/COM_MapUVNode.cpp
source/blender/compositor/nodes/COM_MapValueNode.cpp
source/blender/compositor/nodes/COM_MathNode.cpp
source/blender/compositor/nodes/COM_MixNode.cpp
source/blender/compositor/nodes/COM_MovieDistortionNode.cpp
source/blender/compositor/nodes/COM_NormalNode.cpp
source/blender/compositor/nodes/COM_NormalizeNode.cpp
source/blender/compositor/nodes/COM_RotateNode.cpp
source/blender/compositor/nodes/COM_ScaleNode.cpp
source/blender/compositor/nodes/COM_SeparateRGBANode.cpp
source/blender/compositor/nodes/COM_SetAlphaNode.cpp
source/blender/compositor/nodes/COM_SplitViewerNode.cpp
source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
source/blender/compositor/nodes/COM_SwitchNode.cpp
source/blender/compositor/nodes/COM_TextureNode.cpp
source/blender/compositor/nodes/COM_TonemapNode.cpp
source/blender/compositor/nodes/COM_TransformNode.cpp
source/blender/compositor/nodes/COM_TranslateNode.cpp
source/blender/compositor/nodes/COM_VectorBlurNode.cpp
source/blender/compositor/nodes/COM_VectorCurveNode.cpp
source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
source/blender/compositor/nodes/COM_ViewerNode.cpp
source/blender/compositor/nodes/COM_ZCombineNode.cpp

index 881aa58ec6bb4152f257b8e51c53359800856382..7227773e117ef2b75c0bfb80cc11c948eb67112e 100644 (file)
@@ -128,65 +128,61 @@ void InputSocket::fireActualDataTypeSet()
 }
 void InputSocket::relinkConnections(InputSocket *relinkToSocket)
 {
-       this->relinkConnections(relinkToSocket, false, -1, NULL);
+       if (!isConnected()) {
+               return;
+       }
+       SocketConnection *connection = this->getConnection();
+       connection->setToSocket(relinkToSocket);
+       relinkToSocket->setConnection(connection);
+       this->setConnection(NULL);
 }
 
-void InputSocket::relinkConnections(InputSocket *relinkToSocket, bool autoconnect, int editorNodeInputSocketIndex, bool duplicate, ExecutionSystem *graph)
-{
-       if (!duplicate) {
-               this->relinkConnections(relinkToSocket, autoconnect, editorNodeInputSocketIndex, graph);
-       }
-       else {
-               if (!this->isConnected() && autoconnect) {
-                       Node *node = (Node*)this->getNode();
-                       switch (this->getActualDataType()) {
-                       case COM_DT_UNKNOWN:
-                       case COM_DT_COLOR:
-                               node->addSetColorOperation(graph, relinkToSocket, editorNodeInputSocketIndex);
-                               break;
-                       case COM_DT_VECTOR:
-                               node->addSetVectorOperation(graph, relinkToSocket, editorNodeInputSocketIndex);
-                               break;
-                       case COM_DT_VALUE:
-                               node->addSetValueOperation(graph, relinkToSocket, editorNodeInputSocketIndex);
-                               break;
-                       }
-                       return;
+void InputSocket::relinkConnectionsDuplicate(InputSocket *relinkToSocket, int editorNodeInputSocketIndex, ExecutionSystem *graph)
+{
+       if (!this->isConnected()) {
+               Node *node = (Node*)this->getNode();
+               switch (this->getActualDataType()) {
+               case COM_DT_UNKNOWN:
+               case COM_DT_COLOR:
+                       node->addSetColorOperation(graph, relinkToSocket, editorNodeInputSocketIndex);
+                       break;
+               case COM_DT_VECTOR:
+                       node->addSetVectorOperation(graph, relinkToSocket, editorNodeInputSocketIndex);
+                       break;
+               case COM_DT_VALUE:
+                       node->addSetValueOperation(graph, relinkToSocket, editorNodeInputSocketIndex);
+                       break;
                }
-               SocketConnection * newConnection = new SocketConnection();
-               OutputSocket * fromSocket = this->getConnection()->getFromSocket();
-               newConnection->setToSocket(relinkToSocket);
-               newConnection->setFromSocket(fromSocket);
-               relinkToSocket->setConnection(newConnection);
-               fromSocket->addConnection(newConnection);
-               graph->addSocketConnection(newConnection);
+               return;
        }
+       SocketConnection * newConnection = new SocketConnection();
+       OutputSocket * fromSocket = this->getConnection()->getFromSocket();
+       newConnection->setToSocket(relinkToSocket);
+       newConnection->setFromSocket(fromSocket);
+       relinkToSocket->setConnection(newConnection);
+       fromSocket->addConnection(newConnection);
+       graph->addSocketConnection(newConnection);
 }
 
-void InputSocket::relinkConnections(InputSocket *relinkToSocket, bool autoconnect, int editorNodeInputSocketIndex, ExecutionSystem *graph)
+void InputSocket::relinkConnections(InputSocket *relinkToSocket,  int editorNodeInputSocketIndex, ExecutionSystem *graph)
 {
-       if (!isConnected()) {
-               if (autoconnect) {
-                       Node *node = (Node*)this->getNode();
-                       switch (this->getActualDataType()) {
-                       case COM_DT_UNKNOWN:
-                       case COM_DT_COLOR:
-                               node->addSetColorOperation(graph, relinkToSocket, editorNodeInputSocketIndex);
-                               break;
-                       case COM_DT_VECTOR:
-                               node->addSetVectorOperation(graph, relinkToSocket, editorNodeInputSocketIndex);
-                               break;
-                       case COM_DT_VALUE:
-                               node->addSetValueOperation(graph, relinkToSocket, editorNodeInputSocketIndex);
-                               break;
-                       }
+       if (isConnected()) {
+               relinkConnections(relinkToSocket);
+       } else {
+               Node *node = (Node*)this->getNode();
+               switch (this->getActualDataType()) {
+               case COM_DT_UNKNOWN:
+               case COM_DT_COLOR:
+                       node->addSetColorOperation(graph, relinkToSocket, editorNodeInputSocketIndex);
+                       break;
+               case COM_DT_VECTOR:
+                       node->addSetVectorOperation(graph, relinkToSocket, editorNodeInputSocketIndex);
+                       break;
+               case COM_DT_VALUE:
+                       node->addSetValueOperation(graph, relinkToSocket, editorNodeInputSocketIndex);
+                       break;
                }
-               return;
        }
-       SocketConnection *connection = this->getConnection();
-       connection->setToSocket(relinkToSocket);
-       relinkToSocket->setConnection(connection);
-       this->setConnection(NULL);
 }
 
 const ChannelInfo *InputSocket::getChannelInfo(const int channelnumber)
index e01793317a5ec5beeca209a95ba1a8eaf97362c6..b1c75e34844b4d0bc252983c94c41c0aa9c77a94 100644 (file)
@@ -126,17 +126,15 @@ public:
          * @param editorNodeInputSocketIndex index of the socket number of the bNode (used to retrieve the value for autoconnection)
          * @param system ExecutionSystem to update to
          */
-       void relinkConnections(InputSocket *relinkToSocket, bool autoconnect, int editorNodeInputSocketIndex, ExecutionSystem *system);
+       void relinkConnections(InputSocket *relinkToSocket, int editorNodeInputSocketIndex, ExecutionSystem *system);
        
        /**
          * @brief move all connections of this input socket to another socket
          * @param relinkToSocket the socket to move to connections to
-         * @param autoconnect will a set operation be added when no connections exist
          * @param editorNodeInputSocketIndex index of the socket number of the bNode (used to retrieve the value for autoconnection)
-         * @param duplicate instead of move do a copy of the connection.
          * @param system ExecutionSystem to update to
          */
-       void relinkConnections(InputSocket *relinkToSocket, bool autoconnect, int editorNodeInputSocketIndex, bool duplicate, ExecutionSystem *system);
+       void relinkConnectionsDuplicate(InputSocket *relinkToSocket, int editorNodeInputSocketIndex, ExecutionSystem *system);
        
        /**
          * @brief set the resize mode
index 0037480d2e986d743d651852756c937bc1ece0d7..eb3cd82117262d7d7263e7bf422e4949b559e7a4 100644 (file)
@@ -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);
 }
index 436d92df7f8c8131f66bbf5a27e1698e1ca5e15c..fa654d35785747e3e89c33ea5142d7f9cf2ba0d2 100644 (file)
@@ -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);
 }
index 789a6a6eee24ef3d323d7f4c671a1da3ffd56ba5..90b2481cc7dbf98e1e67739840ff941d25e7a936 100644 (file)
@@ -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());
index 9e80d024bd2175c62551533ae79f3c2113c487e9..d6f4f58fe7000541bb054f64e5821a4ab2acde34 100644 (file)
@@ -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);
index 322b5893096c1934ac38353750e36ea710bdb064..e99252663d0660e73ad5272d6116208bc04fc1f0 100644 (file)
@@ -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);
        
index c4fac50334c237090057d6112570a02cf90c5369..9ccb58a45dec0b655de7715cc3a04c5fda4561ed 100644 (file)
@@ -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);
 }
index 08980de8d98aa4ed5a610277fc8ba1c4712dc51b..dbe5b9936dc60dfa387e2cd8b12907c93d2cf31d 100644 (file)
@@ -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));
        }
 
index 45176cb007c241d332caecf1ffeed56f13d5c4e4..dd3b3855e3f22dcb4d710ed33e9327c37d5db804 100644 (file)
@@ -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));
index 32c9e50874e8bf74f293a070b972f7a05f984918..7b852678191bcc36fa540c5d14f7250a946b52aa 100644 (file)
@@ -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);
 }
index 995d66fcf23b6ed1235a2f69fc2c087802ebb4b8..4909f1b9895d9288923233cee39a0be2e6bd549e 100644 (file)
@@ -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);
index a96fdf72b1133a0abc87cfe941d38fa9610dca9c..d7cde21a9843a0f9df9bd26cd4606ab4e741a243 100644 (file)
@@ -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());
 
index e5231a48e050af716d86cf9846cac8a80cb35d45..860d1a011944432eaef5995566e76a8b30311167 100644 (file)
@@ -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));
index 1873cad5d576d6c3aa47f8f5945e5d91d502b182..c6090120467dfc4fdf825a66a116cb0de0af40ac 100644 (file)
@@ -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);
 }
index 88043653b4fca486594fac28c90434ba2e87823a..503ca3c8bd3fa460982d1de179ede4d3aa8710eb 100644 (file)
@@ -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);
index 7ff7ee1c13eac175771a1a4c8595b0c54439e9ca..ed2869d35f2882191960ae82917fe136f8379f93 100644 (file)
@@ -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);
 }
index d5fef1e756aaad0c899b94c7bf4afa7bdbfea71d..e6fcc48ac5bff0deadeb402138215ba9a5f4d17d 100644 (file)
@@ -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);
 }
index 94139c132fb7a2b2b10e9587c938942f0faf53de..0b4326a17ca024c827e2587f7facd94c26dc3393 100644 (file)
@@ -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);
index 52329be30340c0165b8708df0532da72f93be0b5..c58fcc874cb61d634dad81d95bc0032160ac7884 100644 (file)
@@ -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);
 }
index 77f7baaef98408ed3101438681fe1cf544fd3328..e4e19fdbe27d5879d452fbeabd4b7ae2afa501ee 100644 (file)
@@ -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());
        }
        
index ab6917f3a59d2823bf8e0fedd4a4fbfec23f638e..c26fb4e5c5dffffe2ae683713418848fb7079272 100644 (file)
@@ -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);
index 8f53c1ff8cc2c058ecd4318a00f811351f08e065..cc96f672ebd52231638d4e0bd239b23b8e38f6f9 100644 (file)
@@ -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);
                }
index cefeffcfc07f0a97512e442099f1d8811dfbbab6..d63fbbdb092bdfe9e30fa69f7d204239afb90d63 100644 (file)
@@ -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);
 }
index 5fe9591bfd4b5f7e65e5a34627dfad7ae320e0d4..9604db378bcf1e1b7fd7112247cb2b472fc41e59 100644 (file)
@@ -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);
index 3fc4a882eaf9fd75cf372582bb3b0186af434696..d7b4e481ec281a8644a91a087f70d7acaa04a624 100644 (file)
@@ -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());
index 1ac273a52cb8ef34d0e893505b454749252ef389..ab9e101dad81a31b4ed5b47f804472f1462453c1 100644 (file)
@@ -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);
 }
index 7e327a306b61d7e5d8362b7ab32e43b13cc07d0d..f5003c4be945cd33a01672c5161c3279d4423aa1 100644 (file)
@@ -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);
        
index a1d405c0dffd42d735b8eef07d9084860ee08acc..bdba69dc47d24e412597961a351f2e76c69cc067 100644 (file)
@@ -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);
        
index a4924aaae401163d16a01ccce5311a3ce48ab5a5..0830c7578331bf64b3271246f6dae8a6a1f6d2fc 100644 (file)
@@ -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);
 }
index e5391e54e72d61cf53fca7a227595f23ed44e44c..58b0560761819d8a9e35d053d6de48db4ca7ea6c 100644 (file)
@@ -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);
 }
index e882c16814a07d2b055ed29366d0d8d951344690..9382e726d76504574bb2cfca5ff75829cb85e3f0 100644 (file)
@@ -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));
index 67e829a5cf60f83d99f34fbc09b3dda080cd3e5f..076d4f1501a89c38b46d0f0497989dca9c85166a 100644 (file)
@@ -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);
                        }
                }
index 80c786ef6d7f1890a7930cc28dbf5d15feb69122..ae96a8c9fb826c1304387bbe65dff68859ea2f52 100644 (file)
@@ -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);
index d78592884c605a59e8bd4444e3f58c1bb557ad16..32c7d4719a42d9d97130e59f2dba4fe3aa599a73 100644 (file)
@@ -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);
index ea9e279009cef162260aad6288040def146a3e7f..82d3ae8ca29f82fe78a0bf0452eb45eb898f14fb 100644 (file)
@@ -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));
        }
index 616a63ae9482917bb30719182c478cfbe7a71053..5d039239fbe41b7620b9e5d5ebc42c645474c5aa 100644 (file)
@@ -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);
 }
index 5719f31180bf815dc8a06193c6143ced0e151f57..e55dd5e64d8cb635c592e3672eccdf1533f8e2c8 100644 (file)
@@ -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));
index 8c9ebeed1cfa9f55689d03f14646d4bfc7d6c1c9..eb78657f3c4ec99691389e57d8e37a554fe8be92 100644 (file)
@@ -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()) {
index 32db5ac13a87e51ccbe294f4b813b3de83eb5f6c..e0e7e2594edd9d1464199734df290e2c136df7f4 100644 (file)
@@ -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();
index 4ca93113dd5e8a182202529829047eb7524d1e1c..f56662b1d64cb76119e2349fa5be34bfbf265328 100644 (file)
@@ -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);
 }
index a5c4aa0172191bf1471d36a1c783ae2922dcb881..eabd0481e3859a98cae3dce2938bb1401b671d8a 100644 (file)
@@ -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);
index 63ab83834f2427d6b3423d12c10d12f814ee4669..86ca5ebc2378adffdd7c14bb4f56b72f5883a79f 100644 (file)
@@ -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);
        
index 55e51baf7dab25c42271e7fd2f904cef1794098c..bdf4c53fa729e39a6385083dc6036be30ecf1e8e 100644 (file)
@@ -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);
 }
index 58b6ba1f410bee583eea710fcc3ea9705ff4b8cc..0b1faafe3025afd53cdc3f9180b8d9a9c4db26f3 100644 (file)
@@ -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);
        }
index f3fe8579a864e34ce2c8703171a05dcd4271dda3..11173b3a73fd3911c7006dd313cb85182fcc22e4 100644 (file)
@@ -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);
index f5fdf19398d420b8ed479261f223aa003869c579..48acc567739b8da34300a8f99d6ebd78b83eafde 100644 (file)
@@ -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);
index fe5862da0184496a394bf18ef4f5c30ac10eca03..d709781299f650ced500cdc17f11720ccb7983b4 100644 (file)
@@ -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);
        }
index 7079762d4651ad12e5159fe27557616814183fdd..dd154fe604d3228a25a85281bccfd7df71d2cd33 100644 (file)
@@ -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);
        }
index 90db6682184770a9bd16b4ab57cffd12a837b571..1d09b81c4d284ee5d72fa4050708a24a4e36d68e 100644 (file)
@@ -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);
index d1a2cccf7586b934a14ac0b911b4f428128146b8..9f9efbd8fe571368453c583209d4925b7bd7a487 100644 (file)
@@ -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);
        }
index 047b4fa4bf67d4e5804e12726868c73e31b29ae4..7234e71a43c961c0cc8dc2ce8da514036130b73e 100644 (file)
@@ -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));
        
index c65d7fbdc618cf894d1656ddd64d952c03bd966a..58c60a96de8ed78fc32e89a6d952cc600017523b 100644 (file)
@@ -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());
 
index 5e59d86e7d98e913d2c62c65a0225d74cc1a0815..be8bb623f4c3bc07270be0d9c9b00445d1ad19ca 100644 (file)
@@ -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);
index 7e170ea1704af7838c3974e10211be6f4d4e7d9e..80f02f3edbbbec651ca74cb63be566c9285310bf 100644 (file)
@@ -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);
 }
index 6762cb0687a57ef0dc9c4629e6558f54a35fefb0..da3e85036a568ec20a022c827d23979c6759436d 100644 (file)
@@ -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());
        
index f594db3c160519801f07b281127e3239b1cb0e12..407c6da4e4d3a0267892f576e4072f36bdd52891 100644 (file)
@@ -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);
 }
index 4baa23157999d21fc09706089ccf7cc288ef5121..596256eb6affecee6ebccced5724b00528b161c3 100644 (file)
@@ -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);
 }
index 2f216b5d5bdfb9aecb827ce95546587e9cd62f5b..908e1a19f1655fef8e93402ecd462a4ca1e57117 100644 (file)
@@ -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);
index 9aa922faa5db8aa26d0a19c79f5150a96304edec..cedf81e3f2a8658f4078a0704ecb00ddda68d22e 100644 (file)
@@ -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());
index d518976143de7b35b081e170b064092708b398ae..7609928bc15ec61a4b93b45a6de0e640673a795d 100644 (file)
@@ -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);
index 25d9a6e97d2a2134c4421259ac522076f869112b..2495d1a5ab23d1191818ef4e3dd793f0279388f3 100644 (file)
@@ -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);
                }