diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-23 04:21:22 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-23 04:22:25 +0300 |
commit | 3302fbaeb1d5f58d926c06b6153ec5d6f1a9b0be (patch) | |
tree | 5be399e227415fef745bcdb2b7f20a578628718b /source/blender/compositor/nodes | |
parent | 64b4b719ebd5201d27aa25d7fa2d765eabded9b0 (diff) |
Cleanup: style, use braces for compositor
Diffstat (limited to 'source/blender/compositor/nodes')
13 files changed, 76 insertions, 38 deletions
diff --git a/source/blender/compositor/nodes/COM_CompositorNode.cpp b/source/blender/compositor/nodes/COM_CompositorNode.cpp index 30072d6a5a7..32ac1fccec9 100644 --- a/source/blender/compositor/nodes/COM_CompositorNode.cpp +++ b/source/blender/compositor/nodes/COM_CompositorNode.cpp @@ -49,10 +49,12 @@ void CompositorNode::convertToOperations(NodeConverter &converter, converter.addOperation(compositorOperation); converter.mapInputSocket(imageSocket, compositorOperation->getInputSocket(0)); /* only use alpha link if "use alpha" is enabled */ - if (ignore_alpha) + if (ignore_alpha) { converter.addInputValue(compositorOperation->getInputSocket(1), 1.0f); - else + } + else { converter.mapInputSocket(alphaSocket, compositorOperation->getInputSocket(1)); + } converter.mapInputSocket(depthSocket, compositorOperation->getInputSocket(2)); converter.addNodeInputPreview(imageSocket); diff --git a/source/blender/compositor/nodes/COM_DefocusNode.cpp b/source/blender/compositor/nodes/COM_DefocusNode.cpp index 5e83372a70a..8d64b629e40 100644 --- a/source/blender/compositor/nodes/COM_DefocusNode.cpp +++ b/source/blender/compositor/nodes/COM_DefocusNode.cpp @@ -109,10 +109,12 @@ void DefocusNode::convertToOperations(NodeConverter &converter, #endif VariableSizeBokehBlurOperation *operation = new VariableSizeBokehBlurOperation(); - if (data->preview) + if (data->preview) { operation->setQuality(COM_QUALITY_LOW); - else + } + else { operation->setQuality(context.getQuality()); + } operation->setMaxBlur(data->maxblur); operation->setThreshold(data->bthresh); converter.addOperation(operation); diff --git a/source/blender/compositor/nodes/COM_DisplaceNode.cpp b/source/blender/compositor/nodes/COM_DisplaceNode.cpp index 6ff273b14b7..0c0c3aad646 100644 --- a/source/blender/compositor/nodes/COM_DisplaceNode.cpp +++ b/source/blender/compositor/nodes/COM_DisplaceNode.cpp @@ -30,10 +30,12 @@ void DisplaceNode::convertToOperations(NodeConverter &converter, const CompositorContext &context) const { NodeOperation *operation; - if (context.getQuality() == COM_QUALITY_LOW) + if (context.getQuality() == COM_QUALITY_LOW) { operation = new DisplaceSimpleOperation(); - else + } + else { operation = new DisplaceOperation(); + } converter.addOperation(operation); converter.mapInputSocket(getInputSocket(0), operation->getInputSocket(0)); diff --git a/source/blender/compositor/nodes/COM_ImageNode.cpp b/source/blender/compositor/nodes/COM_ImageNode.cpp index cf25e9f26ae..31de6c6867e 100644 --- a/source/blender/compositor/nodes/COM_ImageNode.cpp +++ b/source/blender/compositor/nodes/COM_ImageNode.cpp @@ -118,8 +118,9 @@ void ImageNode::convertToOperations(NodeConverter &converter, * check if the view name exists in the image */ view = BLI_findstringindex( &image->rr->views, context.getViewName(), offsetof(RenderView, name)); - if (view == -1) + if (view == -1) { view = 0; + } } else { view = view_image - 1; @@ -195,8 +196,9 @@ void ImageNode::convertToOperations(NodeConverter &converter, } /* incase we can't load the layer */ - if (operation == NULL) + if (operation == NULL) { converter.setInvalidOutput(getOutputSocket(index)); + } } } } @@ -204,8 +206,9 @@ void ImageNode::convertToOperations(NodeConverter &converter, /* without this, multilayer that fail to load will crash blender [#32490] */ if (is_multilayer_ok == false) { - for (int i = 0; i < getNumberOfOutputSockets(); ++i) + for (int i = 0; i < getNumberOfOutputSockets(); ++i) { converter.setInvalidOutput(getOutputSocket(i)); + } } } else { diff --git a/source/blender/compositor/nodes/COM_KeyingNode.cpp b/source/blender/compositor/nodes/COM_KeyingNode.cpp index 1bb9b9aa057..b2ce7e1988c 100644 --- a/source/blender/compositor/nodes/COM_KeyingNode.cpp +++ b/source/blender/compositor/nodes/COM_KeyingNode.cpp @@ -302,8 +302,9 @@ void KeyingNode::convertToOperations(NodeConverter &converter, } /* apply blur on matte if needed */ - if (keying_data->blur_post) + if (keying_data->blur_post) { postprocessedMatte = setupPostBlur(converter, postprocessedMatte, keying_data->blur_post); + } /* matte dilate/erode */ if (keying_data->dilate_distance != 0) { @@ -342,6 +343,7 @@ void KeyingNode::convertToOperations(NodeConverter &converter, converter.mapOutputSocket(outputImage, postprocessedImage); converter.mapOutputSocket(outputMatte, postprocessedMatte); - if (edgesMatte) + if (edgesMatte) { converter.mapOutputSocket(outputEdges, edgesMatte); + } } diff --git a/source/blender/compositor/nodes/COM_LensDistortionNode.cpp b/source/blender/compositor/nodes/COM_LensDistortionNode.cpp index a4e638e20e6..34d2fba6433 100644 --- a/source/blender/compositor/nodes/COM_LensDistortionNode.cpp +++ b/source/blender/compositor/nodes/COM_LensDistortionNode.cpp @@ -44,10 +44,12 @@ void LensDistortionNode::convertToOperations(NodeConverter &converter, operation->setFit(data->fit); operation->setJitter(data->jit); - if (!getInputSocket(1)->isLinked()) + if (!getInputSocket(1)->isLinked()) { operation->setDistortion(getInputSocket(1)->getEditorValueFloat()); - if (!getInputSocket(2)->isLinked()) + } + if (!getInputSocket(2)->isLinked()) { operation->setDispersion(getInputSocket(2)->getEditorValueFloat()); + } converter.addOperation(operation); diff --git a/source/blender/compositor/nodes/COM_MovieClipNode.cpp b/source/blender/compositor/nodes/COM_MovieClipNode.cpp index 342f0a9f88a..f5ea6b2653a 100644 --- a/source/blender/compositor/nodes/COM_MovieClipNode.cpp +++ b/source/blender/compositor/nodes/COM_MovieClipNode.cpp @@ -51,11 +51,13 @@ void MovieClipNode::convertToOperations(NodeConverter &converter, ImBuf *ibuf = NULL; if (movieClip) { - if (cacheFrame) + if (cacheFrame) { ibuf = BKE_movieclip_get_ibuf(movieClip, movieClipUser); - else + } + else { ibuf = BKE_movieclip_get_ibuf_flag( movieClip, movieClipUser, movieClip->flag, MOVIECLIP_CACHE_SKIP); + } } // always connect the output image diff --git a/source/blender/compositor/nodes/COM_RenderLayersNode.cpp b/source/blender/compositor/nodes/COM_RenderLayersNode.cpp index 26f21713a77..a361c57a2c2 100644 --- a/source/blender/compositor/nodes/COM_RenderLayersNode.cpp +++ b/source/blender/compositor/nodes/COM_RenderLayersNode.cpp @@ -46,8 +46,9 @@ void RenderLayersNode::testSocketLink(NodeConverter &converter, converter.mapOutputSocket(output, operation->getOutputSocket()); converter.addOperation(operation); - if (is_preview) /* only for image socket */ + if (is_preview) { /* only for image socket */ converter.addPreview(operation->getOutputSocket()); + } } void RenderLayersNode::testRenderLink(NodeConverter &converter, diff --git a/source/blender/compositor/nodes/COM_SeparateColorNode.cpp b/source/blender/compositor/nodes/COM_SeparateColorNode.cpp index 499b2fa96f9..712ba1e1f2d 100644 --- a/source/blender/compositor/nodes/COM_SeparateColorNode.cpp +++ b/source/blender/compositor/nodes/COM_SeparateColorNode.cpp @@ -45,10 +45,12 @@ void SeparateColorNode::convertToOperations(NodeConverter &converter, operation->setChannel(0); converter.addOperation(operation); - if (color_conv) + if (color_conv) { converter.addLink(color_conv->getOutputSocket(), operation->getInputSocket(0)); - else + } + else { converter.mapInputSocket(imageSocket, operation->getInputSocket(0)); + } converter.mapOutputSocket(outputRSocket, operation->getOutputSocket(0)); } @@ -57,10 +59,12 @@ void SeparateColorNode::convertToOperations(NodeConverter &converter, operation->setChannel(1); converter.addOperation(operation); - if (color_conv) + if (color_conv) { converter.addLink(color_conv->getOutputSocket(), operation->getInputSocket(0)); - else + } + else { converter.mapInputSocket(imageSocket, operation->getInputSocket(0)); + } converter.mapOutputSocket(outputGSocket, operation->getOutputSocket(0)); } @@ -69,10 +73,12 @@ void SeparateColorNode::convertToOperations(NodeConverter &converter, operation->setChannel(2); converter.addOperation(operation); - if (color_conv) + if (color_conv) { converter.addLink(color_conv->getOutputSocket(), operation->getInputSocket(0)); - else + } + else { converter.mapInputSocket(imageSocket, operation->getInputSocket(0)); + } converter.mapOutputSocket(outputBSocket, operation->getOutputSocket(0)); } @@ -81,10 +87,12 @@ void SeparateColorNode::convertToOperations(NodeConverter &converter, operation->setChannel(3); converter.addOperation(operation); - if (color_conv) + if (color_conv) { converter.addLink(color_conv->getOutputSocket(), operation->getInputSocket(0)); - else + } + else { converter.mapInputSocket(imageSocket, operation->getInputSocket(0)); + } converter.mapOutputSocket(outputASocket, operation->getOutputSocket(0)); } } diff --git a/source/blender/compositor/nodes/COM_SocketProxyNode.cpp b/source/blender/compositor/nodes/COM_SocketProxyNode.cpp index d924d2ce9f8..5476a21d2a5 100644 --- a/source/blender/compositor/nodes/COM_SocketProxyNode.cpp +++ b/source/blender/compositor/nodes/COM_SocketProxyNode.cpp @@ -34,17 +34,21 @@ SocketProxyNode::SocketProxyNode(bNode *editorNode, DataType dt; dt = COM_DT_VALUE; - if (editorInput->type == SOCK_RGBA) + if (editorInput->type == SOCK_RGBA) { dt = COM_DT_COLOR; - if (editorInput->type == SOCK_VECTOR) + } + if (editorInput->type == SOCK_VECTOR) { dt = COM_DT_VECTOR; + } this->addInputSocket(dt, editorInput); dt = COM_DT_VALUE; - if (editorOutput->type == SOCK_RGBA) + if (editorOutput->type == SOCK_RGBA) { dt = COM_DT_COLOR; - if (editorOutput->type == SOCK_VECTOR) + } + if (editorOutput->type == SOCK_VECTOR) { dt = COM_DT_VECTOR; + } this->addOutputSocket(dt, editorOutput); } @@ -63,17 +67,21 @@ SocketBufferNode::SocketBufferNode(bNode *editorNode, DataType dt; dt = COM_DT_VALUE; - if (editorInput->type == SOCK_RGBA) + if (editorInput->type == SOCK_RGBA) { dt = COM_DT_COLOR; - if (editorInput->type == SOCK_VECTOR) + } + if (editorInput->type == SOCK_VECTOR) { dt = COM_DT_VECTOR; + } this->addInputSocket(dt, editorInput); dt = COM_DT_VALUE; - if (editorOutput->type == SOCK_RGBA) + if (editorOutput->type == SOCK_RGBA) { dt = COM_DT_COLOR; - if (editorOutput->type == SOCK_VECTOR) + } + if (editorOutput->type == SOCK_VECTOR) { dt = COM_DT_VECTOR; + } this->addOutputSocket(dt, editorOutput); } diff --git a/source/blender/compositor/nodes/COM_SplitViewerNode.cpp b/source/blender/compositor/nodes/COM_SplitViewerNode.cpp index b44f82f71d0..f73e3d08a74 100644 --- a/source/blender/compositor/nodes/COM_SplitViewerNode.cpp +++ b/source/blender/compositor/nodes/COM_SplitViewerNode.cpp @@ -69,6 +69,7 @@ void SplitViewerNode::convertToOperations(NodeConverter &converter, converter.addPreview(splitViewerOperation->getOutputSocket()); - if (do_output) + if (do_output) { converter.registerViewer(viewerOperation); + } } diff --git a/source/blender/compositor/nodes/COM_SwitchNode.cpp b/source/blender/compositor/nodes/COM_SwitchNode.cpp index 342f6bc159c..947774e98ae 100644 --- a/source/blender/compositor/nodes/COM_SwitchNode.cpp +++ b/source/blender/compositor/nodes/COM_SwitchNode.cpp @@ -29,10 +29,12 @@ void SwitchNode::convertToOperations(NodeConverter &converter, bool condition = this->getbNode()->custom1; NodeOperationOutput *result; - if (!condition) + if (!condition) { result = converter.addInputProxy(getInputSocket(0), false); - else + } + else { result = converter.addInputProxy(getInputSocket(1), false); + } converter.mapOutputSocket(getOutputSocket(0), result); } diff --git a/source/blender/compositor/nodes/COM_ViewerNode.cpp b/source/blender/compositor/nodes/COM_ViewerNode.cpp index 08f3be27c55..6170fafcb2c 100644 --- a/source/blender/compositor/nodes/COM_ViewerNode.cpp +++ b/source/blender/compositor/nodes/COM_ViewerNode.cpp @@ -68,14 +68,17 @@ void ViewerNode::convertToOperations(NodeConverter &converter, converter.addOperation(viewerOperation); converter.mapInputSocket(imageSocket, viewerOperation->getInputSocket(0)); /* only use alpha link if "use alpha" is enabled */ - if (ignore_alpha) + if (ignore_alpha) { converter.addInputValue(viewerOperation->getInputSocket(1), 1.0f); - else + } + else { converter.mapInputSocket(alphaSocket, viewerOperation->getInputSocket(1)); + } converter.mapInputSocket(depthSocket, viewerOperation->getInputSocket(2)); converter.addNodeInputPreview(imageSocket); - if (do_output) + if (do_output) { converter.registerViewer(viewerOperation); + } } |