Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/compositor/nodes/COM_CompositorNode.cpp
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/compositor/nodes/COM_CompositorNode.cpp')
-rw-r--r--source/blender/compositor/nodes/COM_CompositorNode.cpp54
1 files changed, 27 insertions, 27 deletions
diff --git a/source/blender/compositor/nodes/COM_CompositorNode.cpp b/source/blender/compositor/nodes/COM_CompositorNode.cpp
index e0a6dc4aaeb..30072d6a5a7 100644
--- a/source/blender/compositor/nodes/COM_CompositorNode.cpp
+++ b/source/blender/compositor/nodes/COM_CompositorNode.cpp
@@ -22,38 +22,38 @@
CompositorNode::CompositorNode(bNode *editorNode) : Node(editorNode)
{
- /* pass */
+ /* pass */
}
-void CompositorNode::convertToOperations(NodeConverter &converter, const CompositorContext &context) const
+void CompositorNode::convertToOperations(NodeConverter &converter,
+ const CompositorContext &context) const
{
- bNode *editorNode = this->getbNode();
- bool is_active = (editorNode->flag & NODE_DO_OUTPUT_RECALC) ||
- context.isRendering();
- bool ignore_alpha = (editorNode->custom2 & CMP_NODE_OUTPUT_IGNORE_ALPHA) != 0;
+ bNode *editorNode = this->getbNode();
+ bool is_active = (editorNode->flag & NODE_DO_OUTPUT_RECALC) || context.isRendering();
+ bool ignore_alpha = (editorNode->custom2 & CMP_NODE_OUTPUT_IGNORE_ALPHA) != 0;
- NodeInput *imageSocket = this->getInputSocket(0);
- NodeInput *alphaSocket = this->getInputSocket(1);
- NodeInput *depthSocket = this->getInputSocket(2);
+ NodeInput *imageSocket = this->getInputSocket(0);
+ NodeInput *alphaSocket = this->getInputSocket(1);
+ NodeInput *depthSocket = this->getInputSocket(2);
- CompositorOperation *compositorOperation = new CompositorOperation();
- compositorOperation->setScene(context.getScene());
- compositorOperation->setSceneName(context.getScene()->id.name);
- compositorOperation->setRenderData(context.getRenderData());
- compositorOperation->setViewName(context.getViewName());
- compositorOperation->setbNodeTree(context.getbNodeTree());
- /* alpha socket gives either 1 or a custom alpha value if "use alpha" is enabled */
- compositorOperation->setUseAlphaInput(ignore_alpha || alphaSocket->isLinked());
- compositorOperation->setActive(is_active);
+ CompositorOperation *compositorOperation = new CompositorOperation();
+ compositorOperation->setScene(context.getScene());
+ compositorOperation->setSceneName(context.getScene()->id.name);
+ compositorOperation->setRenderData(context.getRenderData());
+ compositorOperation->setViewName(context.getViewName());
+ compositorOperation->setbNodeTree(context.getbNodeTree());
+ /* alpha socket gives either 1 or a custom alpha value if "use alpha" is enabled */
+ compositorOperation->setUseAlphaInput(ignore_alpha || alphaSocket->isLinked());
+ compositorOperation->setActive(is_active);
- converter.addOperation(compositorOperation);
- converter.mapInputSocket(imageSocket, compositorOperation->getInputSocket(0));
- /* only use alpha link if "use alpha" is enabled */
- if (ignore_alpha)
- converter.addInputValue(compositorOperation->getInputSocket(1), 1.0f);
- else
- converter.mapInputSocket(alphaSocket, compositorOperation->getInputSocket(1));
- converter.mapInputSocket(depthSocket, compositorOperation->getInputSocket(2));
+ converter.addOperation(compositorOperation);
+ converter.mapInputSocket(imageSocket, compositorOperation->getInputSocket(0));
+ /* only use alpha link if "use alpha" is enabled */
+ if (ignore_alpha)
+ converter.addInputValue(compositorOperation->getInputSocket(1), 1.0f);
+ else
+ converter.mapInputSocket(alphaSocket, compositorOperation->getInputSocket(1));
+ converter.mapInputSocket(depthSocket, compositorOperation->getInputSocket(2));
- converter.addNodeInputPreview(imageSocket);
+ converter.addNodeInputPreview(imageSocket);
}