diff options
Diffstat (limited to 'source/blender/compositor/nodes/COM_ViewerNode.cpp')
-rw-r--r-- | source/blender/compositor/nodes/COM_ViewerNode.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/source/blender/compositor/nodes/COM_ViewerNode.cpp b/source/blender/compositor/nodes/COM_ViewerNode.cpp index 531fa4158bc..5e37bf06dc2 100644 --- a/source/blender/compositor/nodes/COM_ViewerNode.cpp +++ b/source/blender/compositor/nodes/COM_ViewerNode.cpp @@ -31,19 +31,19 @@ ViewerNode::ViewerNode(bNode *editorNode) : Node(editorNode) /* pass */ } -void ViewerNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context) +void ViewerNode::convertToOperations(NodeConverter &converter, const CompositorContext &context) const { bNode *editorNode = this->getbNode(); - bool is_active = (editorNode->flag & NODE_DO_OUTPUT_RECALC || context->isRendering()) && + bool is_active = (editorNode->flag & NODE_DO_OUTPUT_RECALC || context.isRendering()) && ((editorNode->flag & NODE_DO_OUTPUT) && this->isInActiveGroup()); - InputSocket *imageSocket = this->getInputSocket(0); - InputSocket *alphaSocket = this->getInputSocket(1); - InputSocket *depthSocket = this->getInputSocket(2); + NodeInput *imageSocket = this->getInputSocket(0); + NodeInput *alphaSocket = this->getInputSocket(1); + NodeInput *depthSocket = this->getInputSocket(2); Image *image = (Image *)this->getbNode()->id; ImageUser *imageUser = (ImageUser *) this->getbNode()->storage; ViewerOperation *viewerOperation = new ViewerOperation(); - viewerOperation->setbNodeTree(context->getbNodeTree()); + viewerOperation->setbNodeTree(context.getbNodeTree()); viewerOperation->setImage(image); viewerOperation->setImageUser(imageUser); viewerOperation->setActive(is_active); @@ -52,20 +52,20 @@ void ViewerNode::convertToOperations(ExecutionSystem *graph, CompositorContext * viewerOperation->setCenterY(editorNode->custom4); viewerOperation->setIgnoreAlpha(editorNode->custom2 & CMP_NODE_OUTPUT_IGNORE_ALPHA); - viewerOperation->setViewSettings(context->getViewSettings()); - viewerOperation->setDisplaySettings(context->getDisplaySettings()); + viewerOperation->setViewSettings(context.getViewSettings()); + viewerOperation->setDisplaySettings(context.getDisplaySettings()); viewerOperation->setResolutionInputSocketIndex(0); - if (!imageSocket->isConnected()) { - if (alphaSocket->isConnected()) { + if (!imageSocket->isLinked()) { + if (alphaSocket->isLinked()) { viewerOperation->setResolutionInputSocketIndex(1); } } - imageSocket->relinkConnections(viewerOperation->getInputSocket(0), 0, graph); - alphaSocket->relinkConnections(viewerOperation->getInputSocket(1)); - depthSocket->relinkConnections(viewerOperation->getInputSocket(2)); - graph->addOperation(viewerOperation); + converter.addOperation(viewerOperation); + converter.mapInputSocket(imageSocket, viewerOperation->getInputSocket(0)); + converter.mapInputSocket(alphaSocket, viewerOperation->getInputSocket(1)); + converter.mapInputSocket(depthSocket, viewerOperation->getInputSocket(2)); - addPreviewOperation(graph, context, viewerOperation->getInputSocket(0)); + converter.addNodeInputPreview(imageSocket); } |