diff options
Diffstat (limited to 'source/blender/compositor/nodes')
170 files changed, 985 insertions, 123 deletions
diff --git a/source/blender/compositor/nodes/COM_AlphaOverNode.cc b/source/blender/compositor/nodes/COM_AlphaOverNode.cc index 640fbf49808..5e09902aee2 100644 --- a/source/blender/compositor/nodes/COM_AlphaOverNode.cc +++ b/source/blender/compositor/nodes/COM_AlphaOverNode.cc @@ -26,6 +26,8 @@ #include "COM_SetValueOperation.h" #include "DNA_material_types.h" /* the ramp types */ +namespace blender::compositor { + void AlphaOverNode::convertToOperations(NodeConverter &converter, const CompositorContext & /*context*/) const { @@ -64,3 +66,5 @@ void AlphaOverNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(getInputSocket(2), convertProg->getInputSocket(2)); converter.mapOutputSocket(getOutputSocket(0), convertProg->getOutputSocket(0)); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_AlphaOverNode.h b/source/blender/compositor/nodes/COM_AlphaOverNode.h index 32cd2e20204..201c8ed5b6e 100644 --- a/source/blender/compositor/nodes/COM_AlphaOverNode.h +++ b/source/blender/compositor/nodes/COM_AlphaOverNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief AlphaOverNode * \ingroup Node @@ -29,5 +31,8 @@ class AlphaOverNode : public Node { AlphaOverNode(bNode *editorNode) : Node(editorNode) { } - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_AntiAliasingNode.cc b/source/blender/compositor/nodes/COM_AntiAliasingNode.cc new file mode 100644 index 00000000000..af4832665df --- /dev/null +++ b/source/blender/compositor/nodes/COM_AntiAliasingNode.cc @@ -0,0 +1,60 @@ +/* + * Copyright 2017, Blender Foundation. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Contributor: IRIE Shinsuke + */ + +#include "COM_AntiAliasingNode.h" +#include "COM_SMAAOperation.h" +#include "DNA_node_types.h" + +namespace blender::compositor { + +void AntiAliasingNode::convertToOperations(NodeConverter &converter, + const CompositorContext & /*context*/) const +{ + bNode *node = this->getbNode(); + NodeAntiAliasingData *data = (NodeAntiAliasingData *)node->storage; + + /* Edge Detection (First Pass) */ + SMAAEdgeDetectionOperation *operation1 = nullptr; + + operation1 = new SMAAEdgeDetectionOperation(); + operation1->setThreshold(data->threshold); + operation1->setLocalContrastAdaptationFactor(data->contrast_limit); + converter.addOperation(operation1); + + converter.mapInputSocket(getInputSocket(0), operation1->getInputSocket(0)); + + /* Blending Weight Calculation Pixel Shader (Second Pass) */ + SMAABlendingWeightCalculationOperation *operation2 = + new SMAABlendingWeightCalculationOperation(); + operation2->setCornerRounding(data->corner_rounding); + converter.addOperation(operation2); + + converter.addLink(operation1->getOutputSocket(), operation2->getInputSocket(0)); + + /* Neighborhood Blending Pixel Shader (Third Pass) */ + SMAANeighborhoodBlendingOperation *operation3 = new SMAANeighborhoodBlendingOperation(); + converter.addOperation(operation3); + + converter.mapInputSocket(getInputSocket(0), operation3->getInputSocket(0)); + converter.addLink(operation2->getOutputSocket(), operation3->getInputSocket(1)); + converter.mapOutputSocket(getOutputSocket(0), operation3->getOutputSocket()); +} + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_AntiAliasingNode.h b/source/blender/compositor/nodes/COM_AntiAliasingNode.h new file mode 100644 index 00000000000..d4a6d0d26dc --- /dev/null +++ b/source/blender/compositor/nodes/COM_AntiAliasingNode.h @@ -0,0 +1,40 @@ +/* + * Copyright 2017, Blender Foundation. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Contributor: IRIE Shinsuke + */ + +#pragma once + +#include "COM_Node.h" + +namespace blender::compositor { + +/** + * @brief AntiAliasingNode + * @ingroup Node + */ +class AntiAliasingNode : public Node { + public: + AntiAliasingNode(bNode *editorNode) : Node(editorNode) + { + } + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; +}; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_BilateralBlurNode.cc b/source/blender/compositor/nodes/COM_BilateralBlurNode.cc index e8037f923f2..1b9da789d3c 100644 --- a/source/blender/compositor/nodes/COM_BilateralBlurNode.cc +++ b/source/blender/compositor/nodes/COM_BilateralBlurNode.cc @@ -21,6 +21,8 @@ #include "COM_ExecutionSystem.h" #include "DNA_node_types.h" +namespace blender::compositor { + BilateralBlurNode::BilateralBlurNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -39,3 +41,5 @@ void BilateralBlurNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(getInputSocket(1), operation->getInputSocket(1)); converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket(0)); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_BilateralBlurNode.h b/source/blender/compositor/nodes/COM_BilateralBlurNode.h index 39308c7d1b6..fed2612ac02 100644 --- a/source/blender/compositor/nodes/COM_BilateralBlurNode.h +++ b/source/blender/compositor/nodes/COM_BilateralBlurNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief BilateralBlurNode * \ingroup Node @@ -27,5 +29,8 @@ class BilateralBlurNode : public Node { public: BilateralBlurNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_BlurNode.cc b/source/blender/compositor/nodes/COM_BlurNode.cc index b82bede8443..e55a594b9c0 100644 --- a/source/blender/compositor/nodes/COM_BlurNode.cc +++ b/source/blender/compositor/nodes/COM_BlurNode.cc @@ -29,6 +29,8 @@ #include "COM_SetValueOperation.h" #include "DNA_node_types.h" +namespace blender::compositor { + BlurNode::BlurNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -168,3 +170,5 @@ void BlurNode::convertToOperations(NodeConverter &converter, converter.addPreview(output_operation->getOutputSocket()); } } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_BlurNode.h b/source/blender/compositor/nodes/COM_BlurNode.h index 3c832c93ca2..61cdc17f3a9 100644 --- a/source/blender/compositor/nodes/COM_BlurNode.h +++ b/source/blender/compositor/nodes/COM_BlurNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief BlurNode * \ingroup Node @@ -27,5 +29,8 @@ class BlurNode : public Node { public: BlurNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_BokehBlurNode.cc b/source/blender/compositor/nodes/COM_BokehBlurNode.cc index 5096dbef608..1d2a0dae390 100644 --- a/source/blender/compositor/nodes/COM_BokehBlurNode.cc +++ b/source/blender/compositor/nodes/COM_BokehBlurNode.cc @@ -25,6 +25,8 @@ #include "DNA_node_types.h" #include "DNA_object_types.h" +namespace blender::compositor { + BokehBlurNode::BokehBlurNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -75,3 +77,5 @@ void BokehBlurNode::convertToOperations(NodeConverter &converter, } } } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_BokehBlurNode.h b/source/blender/compositor/nodes/COM_BokehBlurNode.h index 87aca9af1f6..2c060936025 100644 --- a/source/blender/compositor/nodes/COM_BokehBlurNode.h +++ b/source/blender/compositor/nodes/COM_BokehBlurNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief BokehBlurNode * \ingroup Node @@ -27,5 +29,8 @@ class BokehBlurNode : public Node { public: BokehBlurNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_BokehImageNode.cc b/source/blender/compositor/nodes/COM_BokehImageNode.cc index 87fe4979c1d..2b0a47c76bc 100644 --- a/source/blender/compositor/nodes/COM_BokehImageNode.cc +++ b/source/blender/compositor/nodes/COM_BokehImageNode.cc @@ -20,6 +20,8 @@ #include "COM_BokehImageOperation.h" #include "COM_ExecutionSystem.h" +namespace blender::compositor { + BokehImageNode::BokehImageNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -36,3 +38,5 @@ void BokehImageNode::convertToOperations(NodeConverter &converter, converter.addPreview(operation->getOutputSocket(0)); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_BokehImageNode.h b/source/blender/compositor/nodes/COM_BokehImageNode.h index b9d957cd6df..323561a7e4f 100644 --- a/source/blender/compositor/nodes/COM_BokehImageNode.h +++ b/source/blender/compositor/nodes/COM_BokehImageNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief BokehImageNode * \ingroup Node @@ -27,5 +29,8 @@ class BokehImageNode : public Node { public: BokehImageNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_BoxMaskNode.cc b/source/blender/compositor/nodes/COM_BoxMaskNode.cc index fe59bd32939..14f42cc42f7 100644 --- a/source/blender/compositor/nodes/COM_BoxMaskNode.cc +++ b/source/blender/compositor/nodes/COM_BoxMaskNode.cc @@ -23,6 +23,8 @@ #include "COM_ScaleOperation.h" #include "COM_SetValueOperation.h" +namespace blender::compositor { + BoxMaskNode::BoxMaskNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -60,7 +62,7 @@ void BoxMaskNode::convertToOperations(NodeConverter &converter, scaleOperation->setOffset(0.0f, 0.0f); scaleOperation->setNewWidth(rd->xsch * render_size_factor); scaleOperation->setNewHeight(rd->ysch * render_size_factor); - scaleOperation->getInputSocket(0)->setResizeMode(COM_SC_NO_RESIZE); + scaleOperation->getInputSocket(0)->setResizeMode(ResizeMode::None); converter.addOperation(scaleOperation); converter.addLink(valueOperation->getOutputSocket(0), scaleOperation->getInputSocket(0)); @@ -70,3 +72,5 @@ void BoxMaskNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(getInputSocket(1), operation->getInputSocket(1)); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_BoxMaskNode.h b/source/blender/compositor/nodes/COM_BoxMaskNode.h index b815fd75284..46cedf7af75 100644 --- a/source/blender/compositor/nodes/COM_BoxMaskNode.h +++ b/source/blender/compositor/nodes/COM_BoxMaskNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief BoxMaskNode * \ingroup Node @@ -27,5 +29,8 @@ class BoxMaskNode : public Node { public: BoxMaskNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_BrightnessNode.cc b/source/blender/compositor/nodes/COM_BrightnessNode.cc index fcd2a6de1f4..b64f1fea99f 100644 --- a/source/blender/compositor/nodes/COM_BrightnessNode.cc +++ b/source/blender/compositor/nodes/COM_BrightnessNode.cc @@ -20,6 +20,8 @@ #include "COM_BrightnessOperation.h" #include "COM_ExecutionSystem.h" +namespace blender::compositor { + BrightnessNode::BrightnessNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -38,3 +40,5 @@ void BrightnessNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(getInputSocket(2), operation->getInputSocket(2)); converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket(0)); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_BrightnessNode.h b/source/blender/compositor/nodes/COM_BrightnessNode.h index b64b622dd71..1084108b1c3 100644 --- a/source/blender/compositor/nodes/COM_BrightnessNode.h +++ b/source/blender/compositor/nodes/COM_BrightnessNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief BrightnessNode * \ingroup Node @@ -27,5 +29,8 @@ class BrightnessNode : public Node { public: BrightnessNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ChannelMatteNode.cc b/source/blender/compositor/nodes/COM_ChannelMatteNode.cc index 598cd7b7745..d0f72274aea 100644 --- a/source/blender/compositor/nodes/COM_ChannelMatteNode.cc +++ b/source/blender/compositor/nodes/COM_ChannelMatteNode.cc @@ -22,6 +22,8 @@ #include "COM_ConvertOperation.h" #include "COM_SetAlphaMultiplyOperation.h" +namespace blender::compositor { + ChannelMatteNode::ChannelMatteNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -93,3 +95,5 @@ void ChannelMatteNode::convertToOperations(NodeConverter &converter, converter.addPreview(operationAlpha->getOutputSocket()); } } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ChannelMatteNode.h b/source/blender/compositor/nodes/COM_ChannelMatteNode.h index bca821fa60c..46100b3f7ea 100644 --- a/source/blender/compositor/nodes/COM_ChannelMatteNode.h +++ b/source/blender/compositor/nodes/COM_ChannelMatteNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief ChannelMatteNode * \ingroup Node @@ -27,5 +29,8 @@ class ChannelMatteNode : public Node { public: ChannelMatteNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ChromaMatteNode.cc b/source/blender/compositor/nodes/COM_ChromaMatteNode.cc index 83e88b35f92..9abf183a843 100644 --- a/source/blender/compositor/nodes/COM_ChromaMatteNode.cc +++ b/source/blender/compositor/nodes/COM_ChromaMatteNode.cc @@ -22,6 +22,8 @@ #include "COM_ConvertOperation.h" #include "COM_SetAlphaMultiplyOperation.h" +namespace blender::compositor { + ChromaMatteNode::ChromaMatteNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -63,3 +65,5 @@ void ChromaMatteNode::convertToOperations(NodeConverter &converter, converter.addPreview(operationAlpha->getOutputSocket()); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ChromaMatteNode.h b/source/blender/compositor/nodes/COM_ChromaMatteNode.h index d8febdde36f..f3ddd013fa4 100644 --- a/source/blender/compositor/nodes/COM_ChromaMatteNode.h +++ b/source/blender/compositor/nodes/COM_ChromaMatteNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief ChromaMatteNode * \ingroup Node @@ -27,5 +29,8 @@ class ChromaMatteNode : public Node { public: ChromaMatteNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ColorBalanceNode.cc b/source/blender/compositor/nodes/COM_ColorBalanceNode.cc index 596d9631297..03e4e143061 100644 --- a/source/blender/compositor/nodes/COM_ColorBalanceNode.cc +++ b/source/blender/compositor/nodes/COM_ColorBalanceNode.cc @@ -23,6 +23,8 @@ #include "COM_ExecutionSystem.h" #include "COM_MixOperation.h" +namespace blender::compositor { + ColorBalanceNode::ColorBalanceNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -71,3 +73,5 @@ void ColorBalanceNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(inputImageSocket, operation->getInputSocket(1)); converter.mapOutputSocket(outputSocket, operation->getOutputSocket(0)); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ColorBalanceNode.h b/source/blender/compositor/nodes/COM_ColorBalanceNode.h index 302b66863ca..243713b4912 100644 --- a/source/blender/compositor/nodes/COM_ColorBalanceNode.h +++ b/source/blender/compositor/nodes/COM_ColorBalanceNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief ColorBalanceNode * \ingroup Node @@ -27,5 +29,8 @@ class ColorBalanceNode : public Node { public: ColorBalanceNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ColorCorrectionNode.cc b/source/blender/compositor/nodes/COM_ColorCorrectionNode.cc index 92b334fddb9..6397b1d8e4b 100644 --- a/source/blender/compositor/nodes/COM_ColorCorrectionNode.cc +++ b/source/blender/compositor/nodes/COM_ColorCorrectionNode.cc @@ -20,6 +20,8 @@ #include "COM_ColorCorrectionOperation.h" #include "COM_ExecutionSystem.h" +namespace blender::compositor { + ColorCorrectionNode::ColorCorrectionNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -41,3 +43,5 @@ void ColorCorrectionNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(getInputSocket(1), operation->getInputSocket(1)); converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket(0)); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ColorCorrectionNode.h b/source/blender/compositor/nodes/COM_ColorCorrectionNode.h index be6545f0cfa..aee07ee07a3 100644 --- a/source/blender/compositor/nodes/COM_ColorCorrectionNode.h +++ b/source/blender/compositor/nodes/COM_ColorCorrectionNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief ColorCorrectionNode * \ingroup Node @@ -27,5 +29,8 @@ class ColorCorrectionNode : public Node { public: ColorCorrectionNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ColorCurveNode.cc b/source/blender/compositor/nodes/COM_ColorCurveNode.cc index e1888f3f0bc..774dd689a46 100644 --- a/source/blender/compositor/nodes/COM_ColorCurveNode.cc +++ b/source/blender/compositor/nodes/COM_ColorCurveNode.cc @@ -20,6 +20,8 @@ #include "COM_ColorCurveOperation.h" #include "COM_ExecutionSystem.h" +namespace blender::compositor { + ColorCurveNode::ColorCurveNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -55,3 +57,5 @@ void ColorCurveNode::convertToOperations(NodeConverter &converter, converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket()); } } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ColorCurveNode.h b/source/blender/compositor/nodes/COM_ColorCurveNode.h index 6eaf1db6fbb..89786b47cf5 100644 --- a/source/blender/compositor/nodes/COM_ColorCurveNode.h +++ b/source/blender/compositor/nodes/COM_ColorCurveNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief ColorCurveNode * \ingroup Node @@ -27,5 +29,8 @@ class ColorCurveNode : public Node { public: ColorCurveNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ColorExposureNode.cc b/source/blender/compositor/nodes/COM_ColorExposureNode.cc index cd0285ac373..a8f164e6b66 100644 --- a/source/blender/compositor/nodes/COM_ColorExposureNode.cc +++ b/source/blender/compositor/nodes/COM_ColorExposureNode.cc @@ -20,6 +20,8 @@ #include "COM_ColorExposureOperation.h" #include "COM_ExecutionSystem.h" +namespace blender::compositor { + ExposureNode::ExposureNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -35,3 +37,5 @@ void ExposureNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(getInputSocket(1), operation->getInputSocket(1)); converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket(0)); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ColorExposureNode.h b/source/blender/compositor/nodes/COM_ColorExposureNode.h index c17e798b979..df9bfc65f81 100644 --- a/source/blender/compositor/nodes/COM_ColorExposureNode.h +++ b/source/blender/compositor/nodes/COM_ColorExposureNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief ExposureNode * \ingroup Node @@ -27,5 +29,8 @@ class ExposureNode : public Node { public: ExposureNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ColorMatteNode.cc b/source/blender/compositor/nodes/COM_ColorMatteNode.cc index 865eee5427f..eadb8ce4f96 100644 --- a/source/blender/compositor/nodes/COM_ColorMatteNode.cc +++ b/source/blender/compositor/nodes/COM_ColorMatteNode.cc @@ -22,6 +22,8 @@ #include "COM_ConvertOperation.h" #include "COM_SetAlphaMultiplyOperation.h" +namespace blender::compositor { + ColorMatteNode::ColorMatteNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -61,3 +63,5 @@ void ColorMatteNode::convertToOperations(NodeConverter &converter, converter.addPreview(operationAlpha->getOutputSocket()); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ColorMatteNode.h b/source/blender/compositor/nodes/COM_ColorMatteNode.h index e84bdfc836f..9d70b6d8416 100644 --- a/source/blender/compositor/nodes/COM_ColorMatteNode.h +++ b/source/blender/compositor/nodes/COM_ColorMatteNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief ColorMatteNode * \ingroup Node @@ -27,5 +29,8 @@ class ColorMatteNode : public Node { public: ColorMatteNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ColorNode.cc b/source/blender/compositor/nodes/COM_ColorNode.cc index e6f8bfa01fe..f8277645a4b 100644 --- a/source/blender/compositor/nodes/COM_ColorNode.cc +++ b/source/blender/compositor/nodes/COM_ColorNode.cc @@ -20,6 +20,8 @@ #include "COM_ExecutionSystem.h" #include "COM_SetColorOperation.h" +namespace blender::compositor { + ColorNode::ColorNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -37,3 +39,5 @@ void ColorNode::convertToOperations(NodeConverter &converter, converter.mapOutputSocket(output, operation->getOutputSocket()); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ColorNode.h b/source/blender/compositor/nodes/COM_ColorNode.h index 9b50e9ab7d4..ae3bf575bb4 100644 --- a/source/blender/compositor/nodes/COM_ColorNode.h +++ b/source/blender/compositor/nodes/COM_ColorNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief ColorNode * \ingroup Node @@ -27,5 +29,8 @@ class ColorNode : public Node { public: ColorNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ColorRampNode.cc b/source/blender/compositor/nodes/COM_ColorRampNode.cc index 1504a76cee7..6b44ef3057e 100644 --- a/source/blender/compositor/nodes/COM_ColorRampNode.cc +++ b/source/blender/compositor/nodes/COM_ColorRampNode.cc @@ -23,6 +23,8 @@ #include "COM_ExecutionSystem.h" #include "DNA_texture_types.h" +namespace blender::compositor { + ColorRampNode::ColorRampNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -50,3 +52,5 @@ void ColorRampNode::convertToOperations(NodeConverter &converter, converter.addLink(operation->getOutputSocket(), operation2->getInputSocket(0)); converter.mapOutputSocket(outputSocketAlpha, operation2->getOutputSocket()); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ColorRampNode.h b/source/blender/compositor/nodes/COM_ColorRampNode.h index b53edf14dbd..d0c0e43d56c 100644 --- a/source/blender/compositor/nodes/COM_ColorRampNode.h +++ b/source/blender/compositor/nodes/COM_ColorRampNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief ColorRampNode * \ingroup Node @@ -27,5 +29,8 @@ class ColorRampNode : public Node { public: ColorRampNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ColorSpillNode.cc b/source/blender/compositor/nodes/COM_ColorSpillNode.cc index d1a3099e998..119cff93e84 100644 --- a/source/blender/compositor/nodes/COM_ColorSpillNode.cc +++ b/source/blender/compositor/nodes/COM_ColorSpillNode.cc @@ -20,6 +20,8 @@ #include "BKE_node.h" #include "COM_ColorSpillOperation.h" +namespace blender::compositor { + ColorSpillNode::ColorSpillNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -45,3 +47,5 @@ void ColorSpillNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(inputSocketFac, operation->getInputSocket(1)); converter.mapOutputSocket(outputSocketImage, operation->getOutputSocket()); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ColorSpillNode.h b/source/blender/compositor/nodes/COM_ColorSpillNode.h index 3cf8072c7b7..731a76e8811 100644 --- a/source/blender/compositor/nodes/COM_ColorSpillNode.h +++ b/source/blender/compositor/nodes/COM_ColorSpillNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief ColorSpillNode * \ingroup Node @@ -27,5 +29,8 @@ class ColorSpillNode : public Node { public: ColorSpillNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ColorToBWNode.cc b/source/blender/compositor/nodes/COM_ColorToBWNode.cc index 4115bad5d3f..dcedfc19e4d 100644 --- a/source/blender/compositor/nodes/COM_ColorToBWNode.cc +++ b/source/blender/compositor/nodes/COM_ColorToBWNode.cc @@ -21,6 +21,8 @@ #include "COM_ConvertOperation.h" #include "COM_ExecutionSystem.h" +namespace blender::compositor { + ColorToBWNode::ColorToBWNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -38,3 +40,5 @@ void ColorToBWNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(colorSocket, convertProg->getInputSocket(0)); converter.mapOutputSocket(valueSocket, convertProg->getOutputSocket(0)); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ColorToBWNode.h b/source/blender/compositor/nodes/COM_ColorToBWNode.h index 6e7025de496..60c08a3c886 100644 --- a/source/blender/compositor/nodes/COM_ColorToBWNode.h +++ b/source/blender/compositor/nodes/COM_ColorToBWNode.h @@ -20,6 +20,9 @@ #include "COM_Node.h" #include "DNA_node_types.h" + +namespace blender::compositor { + /** * \brief ColorToBWNode * \ingroup Node @@ -27,5 +30,8 @@ class ColorToBWNode : public Node { public: ColorToBWNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_CombineColorNode.cc b/source/blender/compositor/nodes/COM_CombineColorNode.cc index 12968f06a10..8a2bbba1c1e 100644 --- a/source/blender/compositor/nodes/COM_CombineColorNode.cc +++ b/source/blender/compositor/nodes/COM_CombineColorNode.cc @@ -20,6 +20,8 @@ #include "COM_ConvertOperation.h" +namespace blender::compositor { + CombineColorNode::CombineColorNode(bNode *editorNode) : Node(editorNode) { } @@ -87,3 +89,5 @@ NodeOperation *CombineYUVANode::getColorConverter(const CompositorContext & /*co { return new ConvertYUVToRGBOperation(); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_CombineColorNode.h b/source/blender/compositor/nodes/COM_CombineColorNode.h index 378a4855abf..29d3fa37817 100644 --- a/source/blender/compositor/nodes/COM_CombineColorNode.h +++ b/source/blender/compositor/nodes/COM_CombineColorNode.h @@ -20,10 +20,13 @@ #include "COM_Node.h" +namespace blender::compositor { + class CombineColorNode : public Node { public: CombineColorNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; protected: virtual NodeOperation *getColorConverter(const CompositorContext &context) const = 0; @@ -35,7 +38,7 @@ class CombineRGBANode : public CombineColorNode { { } - NodeOperation *getColorConverter(const CompositorContext &context) const; + NodeOperation *getColorConverter(const CompositorContext &context) const override; }; class CombineHSVANode : public CombineColorNode { @@ -44,7 +47,7 @@ class CombineHSVANode : public CombineColorNode { { } - NodeOperation *getColorConverter(const CompositorContext &context) const; + NodeOperation *getColorConverter(const CompositorContext &context) const override; }; class CombineYCCANode : public CombineColorNode { @@ -53,7 +56,7 @@ class CombineYCCANode : public CombineColorNode { { } - NodeOperation *getColorConverter(const CompositorContext &context) const; + NodeOperation *getColorConverter(const CompositorContext &context) const override; }; class CombineYUVANode : public CombineColorNode { @@ -62,5 +65,7 @@ class CombineYUVANode : public CombineColorNode { { } - NodeOperation *getColorConverter(const CompositorContext &context) const; + NodeOperation *getColorConverter(const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_CompositorNode.cc b/source/blender/compositor/nodes/COM_CompositorNode.cc index 32ac1fccec9..262fa550915 100644 --- a/source/blender/compositor/nodes/COM_CompositorNode.cc +++ b/source/blender/compositor/nodes/COM_CompositorNode.cc @@ -20,6 +20,8 @@ #include "COM_CompositorOperation.h" #include "COM_ExecutionSystem.h" +namespace blender::compositor { + CompositorNode::CompositorNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -59,3 +61,5 @@ void CompositorNode::convertToOperations(NodeConverter &converter, converter.addNodeInputPreview(imageSocket); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_CompositorNode.h b/source/blender/compositor/nodes/COM_CompositorNode.h index a75355dfc14..4da9f9a766f 100644 --- a/source/blender/compositor/nodes/COM_CompositorNode.h +++ b/source/blender/compositor/nodes/COM_CompositorNode.h @@ -20,6 +20,9 @@ #include "COM_Node.h" #include "DNA_node_types.h" + +namespace blender::compositor { + /** * \brief CompositorNode * \ingroup Node @@ -27,5 +30,8 @@ class CompositorNode : public Node { public: CompositorNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ConvertAlphaNode.cc b/source/blender/compositor/nodes/COM_ConvertAlphaNode.cc index 2921b44c95b..ac4e45357dc 100644 --- a/source/blender/compositor/nodes/COM_ConvertAlphaNode.cc +++ b/source/blender/compositor/nodes/COM_ConvertAlphaNode.cc @@ -20,6 +20,8 @@ #include "COM_ConvertOperation.h" #include "COM_ExecutionSystem.h" +namespace blender::compositor { + void ConvertAlphaNode::convertToOperations(NodeConverter &converter, const CompositorContext & /*context*/) const { @@ -39,3 +41,5 @@ void ConvertAlphaNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(getInputSocket(0), operation->getInputSocket(0)); converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket()); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ConvertAlphaNode.h b/source/blender/compositor/nodes/COM_ConvertAlphaNode.h index 372f34a576f..f3d0ef2cd5b 100644 --- a/source/blender/compositor/nodes/COM_ConvertAlphaNode.h +++ b/source/blender/compositor/nodes/COM_ConvertAlphaNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief ConvertAlphaNode * \ingroup Node @@ -29,5 +31,8 @@ class ConvertAlphaNode : public Node { ConvertAlphaNode(bNode *editorNode) : Node(editorNode) { } - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_CornerPinNode.cc b/source/blender/compositor/nodes/COM_CornerPinNode.cc index efe847bbfbf..6a120cffe0a 100644 --- a/source/blender/compositor/nodes/COM_CornerPinNode.cc +++ b/source/blender/compositor/nodes/COM_CornerPinNode.cc @@ -20,6 +20,8 @@ #include "COM_PlaneCornerPinOperation.h" +namespace blender::compositor { + CornerPinNode::CornerPinNode(bNode *editorNode) : Node(editorNode) { } @@ -53,3 +55,5 @@ void CornerPinNode::convertToOperations(NodeConverter &converter, converter.mapOutputSocket(output_warped_image, warp_image_operation->getOutputSocket()); converter.mapOutputSocket(output_plane, plane_mask_operation->getOutputSocket()); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_CornerPinNode.h b/source/blender/compositor/nodes/COM_CornerPinNode.h index ba845a614fb..779e057ebb5 100644 --- a/source/blender/compositor/nodes/COM_CornerPinNode.h +++ b/source/blender/compositor/nodes/COM_CornerPinNode.h @@ -21,6 +21,8 @@ #include "DNA_node_types.h" +namespace blender::compositor { + /** * \brief CornerPinNode * \ingroup Node @@ -28,5 +30,8 @@ class CornerPinNode : public Node { public: CornerPinNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_CropNode.cc b/source/blender/compositor/nodes/COM_CropNode.cc index 0f0883b0151..3f01062c789 100644 --- a/source/blender/compositor/nodes/COM_CropNode.cc +++ b/source/blender/compositor/nodes/COM_CropNode.cc @@ -19,6 +19,8 @@ #include "COM_CropNode.h" #include "COM_CropOperation.h" +namespace blender::compositor { + CropNode::CropNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -45,3 +47,5 @@ void CropNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(getInputSocket(0), operation->getInputSocket(0)); converter.mapOutputSocket(getOutputSocket(), operation->getOutputSocket()); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_CropNode.h b/source/blender/compositor/nodes/COM_CropNode.h index f643ebbabcc..be3c9a268f9 100644 --- a/source/blender/compositor/nodes/COM_CropNode.h +++ b/source/blender/compositor/nodes/COM_CropNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief CropNode * \ingroup Node @@ -27,5 +29,8 @@ class CropNode : public Node { public: CropNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_CryptomatteNode.cc b/source/blender/compositor/nodes/COM_CryptomatteNode.cc index 591db8a96e5..23305fa06f8 100644 --- a/source/blender/compositor/nodes/COM_CryptomatteNode.cc +++ b/source/blender/compositor/nodes/COM_CryptomatteNode.cc @@ -31,6 +31,8 @@ #include <iterator> #include <string> +namespace blender::compositor { + /** \name Cryptomatte base * \{ */ @@ -176,7 +178,12 @@ void CryptomatteNode::input_operations_from_image_source( } const std::string prefix = prefix_from_node(node); - LISTBASE_FOREACH (RenderLayer *, render_layer, &image->rr->layers) { + int layer_index; + LISTBASE_FOREACH_INDEX (RenderLayer *, render_layer, &image->rr->layers, layer_index) { + if (!blender::StringRef(prefix).startswith(blender::StringRef( + render_layer->name, BLI_strnlen(render_layer->name, sizeof(render_layer->name))))) { + continue; + } LISTBASE_FOREACH (RenderPass *, render_pass, &render_layer->passes) { const std::string combined_name = combined_layer_pass_name(render_layer, render_pass); if (blender::StringRef(combined_name).startswith(prefix)) { @@ -184,10 +191,12 @@ void CryptomatteNode::input_operations_from_image_source( render_layer, render_pass, view); op->setImage(image); op->setImageUser(iuser); + iuser->layer = layer_index; op->setFramenumber(context.getFramenumber()); r_input_operations.append(op); } } + break; } } BKE_image_release_ibuf(image, ibuf, nullptr); @@ -245,7 +254,7 @@ CryptomatteOperation *CryptomatteLegacyNode::create_cryptomatte_operation( const bNode &UNUSED(node), const NodeCryptomatte *cryptomatte_settings) const { - const int num_inputs = getNumberOfInputSockets() - 1; + const int num_inputs = inputs.size() - 1; CryptomatteOperation *operation = new CryptomatteOperation(num_inputs); if (cryptomatte_settings) { LISTBASE_FOREACH (CryptomatteEntry *, cryptomatte_entry, &cryptomatte_settings->entries) { @@ -261,3 +270,5 @@ CryptomatteOperation *CryptomatteLegacyNode::create_cryptomatte_operation( } /* \} */ + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_CryptomatteNode.h b/source/blender/compositor/nodes/COM_CryptomatteNode.h index e99a104c914..a6ba860c678 100644 --- a/source/blender/compositor/nodes/COM_CryptomatteNode.h +++ b/source/blender/compositor/nodes/COM_CryptomatteNode.h @@ -24,6 +24,8 @@ #include "COM_CryptomatteOperation.h" #include "COM_Node.h" +namespace blender::compositor { + /** * \brief CryptomatteNode * \ingroup Node @@ -36,7 +38,8 @@ class CryptomatteBaseNode : public Node { } public: - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; protected: virtual CryptomatteOperation *create_cryptomatte_operation( @@ -87,3 +90,5 @@ class CryptomatteLegacyNode : public CryptomatteBaseNode { const bNode &node, const NodeCryptomatte *cryptomatte_settings) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_DefocusNode.cc b/source/blender/compositor/nodes/COM_DefocusNode.cc index 2343b14f68d..fee7c477d9c 100644 --- a/source/blender/compositor/nodes/COM_DefocusNode.cc +++ b/source/blender/compositor/nodes/COM_DefocusNode.cc @@ -30,6 +30,8 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" +namespace blender::compositor { + DefocusNode::DefocusNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -141,3 +143,5 @@ void DefocusNode::convertToOperations(NodeConverter &converter, converter.mapOutputSocket(getOutputSocket(), operation->getOutputSocket()); } } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_DefocusNode.h b/source/blender/compositor/nodes/COM_DefocusNode.h index c042e98c515..5e51a0ccd52 100644 --- a/source/blender/compositor/nodes/COM_DefocusNode.h +++ b/source/blender/compositor/nodes/COM_DefocusNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief DefocusNode * \ingroup Node @@ -27,5 +29,8 @@ class DefocusNode : public Node { public: DefocusNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_DenoiseNode.cc b/source/blender/compositor/nodes/COM_DenoiseNode.cc index 1aae81e1e7b..e58a9c7ba9a 100644 --- a/source/blender/compositor/nodes/COM_DenoiseNode.cc +++ b/source/blender/compositor/nodes/COM_DenoiseNode.cc @@ -21,6 +21,8 @@ #include "COM_SetValueOperation.h" #include "DNA_node_types.h" +namespace blender::compositor { + DenoiseNode::DenoiseNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -41,3 +43,5 @@ void DenoiseNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(getInputSocket(2), operation->getInputSocket(2)); converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket(0)); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_DenoiseNode.h b/source/blender/compositor/nodes/COM_DenoiseNode.h index 99f59c89fdb..91be8e3e3ad 100644 --- a/source/blender/compositor/nodes/COM_DenoiseNode.h +++ b/source/blender/compositor/nodes/COM_DenoiseNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief DenoiseNode * \ingroup Node @@ -27,5 +29,8 @@ class DenoiseNode : public Node { public: DenoiseNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_DespeckleNode.cc b/source/blender/compositor/nodes/COM_DespeckleNode.cc index 58734917831..beda479025d 100644 --- a/source/blender/compositor/nodes/COM_DespeckleNode.cc +++ b/source/blender/compositor/nodes/COM_DespeckleNode.cc @@ -22,6 +22,8 @@ #include "COM_ExecutionSystem.h" #include "DNA_scene_types.h" +namespace blender::compositor { + DespeckleNode::DespeckleNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -46,3 +48,5 @@ void DespeckleNode::convertToOperations(NodeConverter &converter, converter.addPreview(operation->getOutputSocket(0)); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_DespeckleNode.h b/source/blender/compositor/nodes/COM_DespeckleNode.h index 6b39dd94ac7..2f268e99e1b 100644 --- a/source/blender/compositor/nodes/COM_DespeckleNode.h +++ b/source/blender/compositor/nodes/COM_DespeckleNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief DespeckleNode * \ingroup Node @@ -27,5 +29,8 @@ class DespeckleNode : public Node { public: DespeckleNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_DifferenceMatteNode.cc b/source/blender/compositor/nodes/COM_DifferenceMatteNode.cc index 3d538e9b4a0..8c989bfc04e 100644 --- a/source/blender/compositor/nodes/COM_DifferenceMatteNode.cc +++ b/source/blender/compositor/nodes/COM_DifferenceMatteNode.cc @@ -21,6 +21,8 @@ #include "COM_DifferenceMatteOperation.h" #include "COM_SetAlphaMultiplyOperation.h" +namespace blender::compositor { + DifferenceMatteNode::DifferenceMatteNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -52,3 +54,5 @@ void DifferenceMatteNode::convertToOperations(NodeConverter &converter, converter.addPreview(operation->getOutputSocket()); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_DifferenceMatteNode.h b/source/blender/compositor/nodes/COM_DifferenceMatteNode.h index 26be5fe1e80..a173c723192 100644 --- a/source/blender/compositor/nodes/COM_DifferenceMatteNode.h +++ b/source/blender/compositor/nodes/COM_DifferenceMatteNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief DifferenceMatteNode * \ingroup Node @@ -27,5 +29,8 @@ class DifferenceMatteNode : public Node { public: DifferenceMatteNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_DilateErodeNode.cc b/source/blender/compositor/nodes/COM_DilateErodeNode.cc index e90707618e5..81af1687959 100644 --- a/source/blender/compositor/nodes/COM_DilateErodeNode.cc +++ b/source/blender/compositor/nodes/COM_DilateErodeNode.cc @@ -24,6 +24,8 @@ #include "COM_GaussianAlphaXBlurOperation.h" #include "COM_GaussianAlphaYBlurOperation.h" +namespace blender::compositor { + DilateErodeNode::DilateErodeNode(bNode *editorNode) : Node(editorNode) { /* initialize node data */ @@ -147,3 +149,5 @@ void DilateErodeNode::convertToOperations(NodeConverter &converter, } } } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_DilateErodeNode.h b/source/blender/compositor/nodes/COM_DilateErodeNode.h index 090095df447..7684d7e3834 100644 --- a/source/blender/compositor/nodes/COM_DilateErodeNode.h +++ b/source/blender/compositor/nodes/COM_DilateErodeNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief DilateErodeNode * \ingroup Node @@ -30,5 +32,8 @@ class DilateErodeNode : public Node { public: DilateErodeNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_DirectionalBlurNode.cc b/source/blender/compositor/nodes/COM_DirectionalBlurNode.cc index f8d0eaf4675..90c4236bce8 100644 --- a/source/blender/compositor/nodes/COM_DirectionalBlurNode.cc +++ b/source/blender/compositor/nodes/COM_DirectionalBlurNode.cc @@ -21,6 +21,8 @@ #include "COM_ExecutionSystem.h" #include "DNA_node_types.h" +namespace blender::compositor { + DirectionalBlurNode::DirectionalBlurNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -38,3 +40,5 @@ void DirectionalBlurNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(getInputSocket(0), operation->getInputSocket(0)); converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket()); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_DirectionalBlurNode.h b/source/blender/compositor/nodes/COM_DirectionalBlurNode.h index dfb705cbe64..ce3ef378aaf 100644 --- a/source/blender/compositor/nodes/COM_DirectionalBlurNode.h +++ b/source/blender/compositor/nodes/COM_DirectionalBlurNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief DirectionalBlurNode * \ingroup Node @@ -27,5 +29,8 @@ class DirectionalBlurNode : public Node { public: DirectionalBlurNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_DisplaceNode.cc b/source/blender/compositor/nodes/COM_DisplaceNode.cc index 5b63bc1f393..8217caecf44 100644 --- a/source/blender/compositor/nodes/COM_DisplaceNode.cc +++ b/source/blender/compositor/nodes/COM_DisplaceNode.cc @@ -21,6 +21,8 @@ #include "COM_DisplaceSimpleOperation.h" #include "COM_ExecutionSystem.h" +namespace blender::compositor { + DisplaceNode::DisplaceNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -44,3 +46,5 @@ void DisplaceNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(getInputSocket(3), operation->getInputSocket(3)); converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket()); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_DisplaceNode.h b/source/blender/compositor/nodes/COM_DisplaceNode.h index a9e8a5ad657..b2495839da3 100644 --- a/source/blender/compositor/nodes/COM_DisplaceNode.h +++ b/source/blender/compositor/nodes/COM_DisplaceNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief DisplaceNode * \ingroup Node @@ -27,5 +29,8 @@ class DisplaceNode : public Node { public: DisplaceNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_DistanceMatteNode.cc b/source/blender/compositor/nodes/COM_DistanceMatteNode.cc index 37aeb5c8504..4450c4a2f4a 100644 --- a/source/blender/compositor/nodes/COM_DistanceMatteNode.cc +++ b/source/blender/compositor/nodes/COM_DistanceMatteNode.cc @@ -23,6 +23,8 @@ #include "COM_DistanceYCCMatteOperation.h" #include "COM_SetAlphaMultiplyOperation.h" +namespace blender::compositor { + DistanceMatteNode::DistanceMatteNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -96,3 +98,5 @@ void DistanceMatteNode::convertToOperations(NodeConverter &converter, converter.addPreview(operationAlpha->getOutputSocket()); } } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_DistanceMatteNode.h b/source/blender/compositor/nodes/COM_DistanceMatteNode.h index 6ae71ef715f..0baa531b4d2 100644 --- a/source/blender/compositor/nodes/COM_DistanceMatteNode.h +++ b/source/blender/compositor/nodes/COM_DistanceMatteNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief DistanceMatteNode * \ingroup Node @@ -27,5 +29,8 @@ class DistanceMatteNode : public Node { public: DistanceMatteNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cc b/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cc index 907a9f49353..847dcc2f8f1 100644 --- a/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cc +++ b/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cc @@ -20,6 +20,8 @@ #include "COM_DoubleEdgeMaskOperation.h" #include "COM_ExecutionSystem.h" +namespace blender::compositor { + DoubleEdgeMaskNode::DoubleEdgeMaskNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -40,3 +42,5 @@ void DoubleEdgeMaskNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(getInputSocket(1), operation->getInputSocket(1)); converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket(0)); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.h b/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.h index 6d26cbbf528..90e009747c1 100644 --- a/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.h +++ b/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief DoubleEdgeMaskNode * \ingroup Node @@ -27,5 +29,8 @@ class DoubleEdgeMaskNode : public Node { public: DoubleEdgeMaskNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_EllipseMaskNode.cc b/source/blender/compositor/nodes/COM_EllipseMaskNode.cc index 1ae855c0f1d..3b4f5ca8c94 100644 --- a/source/blender/compositor/nodes/COM_EllipseMaskNode.cc +++ b/source/blender/compositor/nodes/COM_EllipseMaskNode.cc @@ -23,6 +23,8 @@ #include "COM_ScaleOperation.h" #include "COM_SetValueOperation.h" +namespace blender::compositor { + EllipseMaskNode::EllipseMaskNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -60,7 +62,7 @@ void EllipseMaskNode::convertToOperations(NodeConverter &converter, scaleOperation->setOffset(0.0f, 0.0f); scaleOperation->setNewWidth(rd->xsch * render_size_factor); scaleOperation->setNewHeight(rd->ysch * render_size_factor); - scaleOperation->getInputSocket(0)->setResizeMode(COM_SC_NO_RESIZE); + scaleOperation->getInputSocket(0)->setResizeMode(ResizeMode::None); converter.addOperation(scaleOperation); converter.addLink(valueOperation->getOutputSocket(0), scaleOperation->getInputSocket(0)); @@ -70,3 +72,5 @@ void EllipseMaskNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(getInputSocket(1), operation->getInputSocket(1)); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_EllipseMaskNode.h b/source/blender/compositor/nodes/COM_EllipseMaskNode.h index d7376cad52e..cbe189be9f6 100644 --- a/source/blender/compositor/nodes/COM_EllipseMaskNode.h +++ b/source/blender/compositor/nodes/COM_EllipseMaskNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief EllipseMaskNode * \ingroup Node @@ -27,5 +29,8 @@ class EllipseMaskNode : public Node { public: EllipseMaskNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_FilterNode.cc b/source/blender/compositor/nodes/COM_FilterNode.cc index 1147c11794f..351219155c2 100644 --- a/source/blender/compositor/nodes/COM_FilterNode.cc +++ b/source/blender/compositor/nodes/COM_FilterNode.cc @@ -23,6 +23,8 @@ #include "COM_ExecutionSystem.h" #include "COM_MixOperation.h" +namespace blender::compositor { + FilterNode::FilterNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -94,3 +96,5 @@ void FilterNode::convertToOperations(NodeConverter &converter, converter.addPreview(operation->getOutputSocket(0)); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_FilterNode.h b/source/blender/compositor/nodes/COM_FilterNode.h index 735d8925b48..f7f4176cea5 100644 --- a/source/blender/compositor/nodes/COM_FilterNode.h +++ b/source/blender/compositor/nodes/COM_FilterNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief FilterNode * \ingroup Node @@ -27,5 +29,8 @@ class FilterNode : public Node { public: FilterNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_FlipNode.cc b/source/blender/compositor/nodes/COM_FlipNode.cc index d89e6b7b844..bca6cd3c4f7 100644 --- a/source/blender/compositor/nodes/COM_FlipNode.cc +++ b/source/blender/compositor/nodes/COM_FlipNode.cc @@ -21,6 +21,8 @@ #include "COM_ExecutionSystem.h" #include "COM_FlipOperation.h" +namespace blender::compositor { + FlipNode::FlipNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -52,3 +54,5 @@ void FlipNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(inputSocket, operation->getInputSocket(0)); converter.mapOutputSocket(outputSocket, operation->getOutputSocket(0)); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_FlipNode.h b/source/blender/compositor/nodes/COM_FlipNode.h index e819c003430..ee61d09fbba 100644 --- a/source/blender/compositor/nodes/COM_FlipNode.h +++ b/source/blender/compositor/nodes/COM_FlipNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief FlipNode * \ingroup Node @@ -27,5 +29,8 @@ class FlipNode : public Node { public: FlipNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_GammaNode.cc b/source/blender/compositor/nodes/COM_GammaNode.cc index 1ce17faa0dc..52148a80a8f 100644 --- a/source/blender/compositor/nodes/COM_GammaNode.cc +++ b/source/blender/compositor/nodes/COM_GammaNode.cc @@ -20,6 +20,8 @@ #include "COM_ExecutionSystem.h" #include "COM_GammaOperation.h" +namespace blender::compositor { + GammaNode::GammaNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -35,3 +37,5 @@ void GammaNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(getInputSocket(1), operation->getInputSocket(1)); converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket(0)); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_GammaNode.h b/source/blender/compositor/nodes/COM_GammaNode.h index 1a4d02af160..29c9ed170fa 100644 --- a/source/blender/compositor/nodes/COM_GammaNode.h +++ b/source/blender/compositor/nodes/COM_GammaNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief GammaNode * \ingroup Node @@ -27,5 +29,8 @@ class GammaNode : public Node { public: GammaNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_GlareNode.cc b/source/blender/compositor/nodes/COM_GlareNode.cc index ef088e42205..dbe9aaf73ed 100644 --- a/source/blender/compositor/nodes/COM_GlareNode.cc +++ b/source/blender/compositor/nodes/COM_GlareNode.cc @@ -27,6 +27,8 @@ #include "COM_SetValueOperation.h" #include "DNA_node_types.h" +namespace blender::compositor { + GlareNode::GlareNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -65,7 +67,7 @@ void GlareNode::convertToOperations(NodeConverter &converter, MixGlareOperation *mixoperation = new MixGlareOperation(); mixoperation->setResolutionInputSocketIndex(1); - mixoperation->getInputSocket(2)->setResizeMode(COM_SC_FIT); + mixoperation->getInputSocket(2)->setResizeMode(ResizeMode::FitAny); converter.addOperation(glareoperation); converter.addOperation(thresholdOperation); @@ -80,3 +82,5 @@ void GlareNode::convertToOperations(NodeConverter &converter, converter.addLink(glareoperation->getOutputSocket(), mixoperation->getInputSocket(2)); converter.mapOutputSocket(getOutputSocket(), mixoperation->getOutputSocket()); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_GlareNode.h b/source/blender/compositor/nodes/COM_GlareNode.h index 7463af97306..7db5fa85e04 100644 --- a/source/blender/compositor/nodes/COM_GlareNode.h +++ b/source/blender/compositor/nodes/COM_GlareNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief GlareNode * \ingroup Node @@ -27,5 +29,8 @@ class GlareNode : public Node { public: GlareNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cc b/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cc index 00125ba2ea5..5042d217f9a 100644 --- a/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cc +++ b/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cc @@ -26,6 +26,8 @@ #include "COM_SetValueOperation.h" #include "DNA_node_types.h" +namespace blender::compositor { + HueSaturationValueCorrectNode::HueSaturationValueCorrectNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -62,3 +64,5 @@ void HueSaturationValueCorrectNode::convertToOperations( converter.mapInputSocket(valueSocket, blend->getInputSocket(0)); converter.mapOutputSocket(outputSocket, blend->getOutputSocket()); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.h b/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.h index 01790c1a5fb..d75b2ba51ca 100644 --- a/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.h +++ b/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief HueSaturationValueCorrectNode * \ingroup Node @@ -27,5 +29,8 @@ class HueSaturationValueCorrectNode : public Node { public: HueSaturationValueCorrectNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_HueSaturationValueNode.cc b/source/blender/compositor/nodes/COM_HueSaturationValueNode.cc index dc2e5187e8f..54d2caa75af 100644 --- a/source/blender/compositor/nodes/COM_HueSaturationValueNode.cc +++ b/source/blender/compositor/nodes/COM_HueSaturationValueNode.cc @@ -26,6 +26,8 @@ #include "COM_SetValueOperation.h" #include "DNA_node_types.h" +namespace blender::compositor { + HueSaturationValueNode::HueSaturationValueNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -65,3 +67,5 @@ void HueSaturationValueNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(facSocket, blend->getInputSocket(0)); converter.mapOutputSocket(outputSocket, blend->getOutputSocket()); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_HueSaturationValueNode.h b/source/blender/compositor/nodes/COM_HueSaturationValueNode.h index 7ef7abe4188..0b295158cc7 100644 --- a/source/blender/compositor/nodes/COM_HueSaturationValueNode.h +++ b/source/blender/compositor/nodes/COM_HueSaturationValueNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief HueSaturationValueNode * \ingroup Node @@ -27,5 +29,8 @@ class HueSaturationValueNode : public Node { public: HueSaturationValueNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_IDMaskNode.cc b/source/blender/compositor/nodes/COM_IDMaskNode.cc index 5ba54d75bcd..9798dabd035 100644 --- a/source/blender/compositor/nodes/COM_IDMaskNode.cc +++ b/source/blender/compositor/nodes/COM_IDMaskNode.cc @@ -21,6 +21,8 @@ #include "COM_ExecutionSystem.h" #include "COM_IDMaskOperation.h" +namespace blender::compositor { + IDMaskNode::IDMaskNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -47,3 +49,5 @@ void IDMaskNode::convertToOperations(NodeConverter &converter, converter.mapOutputSocket(getOutputSocket(0), antiAliasOperation->getOutputSocket(0)); } } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_IDMaskNode.h b/source/blender/compositor/nodes/COM_IDMaskNode.h index 51076619951..f702732a8ed 100644 --- a/source/blender/compositor/nodes/COM_IDMaskNode.h +++ b/source/blender/compositor/nodes/COM_IDMaskNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief IDMaskNode * \ingroup Node @@ -27,5 +29,8 @@ class IDMaskNode : public Node { public: IDMaskNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ImageNode.cc b/source/blender/compositor/nodes/COM_ImageNode.cc index 711399ccd63..f0bfda0f40e 100644 --- a/source/blender/compositor/nodes/COM_ImageNode.cc +++ b/source/blender/compositor/nodes/COM_ImageNode.cc @@ -29,6 +29,8 @@ #include "COM_SetValueOperation.h" #include "COM_SetVectorOperation.h" +namespace blender::compositor { + ImageNode::ImageNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -77,7 +79,6 @@ void ImageNode::convertToOperations(NodeConverter &converter, Image *image = (Image *)editorNode->id; ImageUser *imageuser = (ImageUser *)editorNode->storage; int framenumber = context.getFramenumber(); - int numberOfOutputs = this->getNumberOfOutputSockets(); bool outputStraightAlpha = (editorNode->custom1 & CMP_NODE_IMAGE_USE_STRAIGHT_OUTPUT) != 0; BKE_image_user_frame_calc(image, imageuser, context.getFramenumber()); /* force a load, we assume iuser index will be set OK anyway */ @@ -87,14 +88,11 @@ void ImageNode::convertToOperations(NodeConverter &converter, if (image->rr) { RenderLayer *rl = (RenderLayer *)BLI_findlink(&image->rr->layers, imageuser->layer); if (rl) { - NodeOutput *socket; - int index; - is_multilayer_ok = true; - for (index = 0; index < numberOfOutputs; index++) { + for (int64_t index = 0; index < outputs.size(); index++) { + NodeOutput *socket = outputs[index]; NodeOperation *operation = nullptr; - socket = this->getOutputSocket(index); bNodeSocket *bnodeSocket = socket->getbNodeSocket(); NodeImageLayer *storage = (NodeImageLayer *)bnodeSocket->storage; RenderPass *rpass = (RenderPass *)BLI_findstring( @@ -171,8 +169,7 @@ void ImageNode::convertToOperations(NodeConverter &converter, converter.addPreview(operation->getOutputSocket()); } if (STREQ(rpass->name, RE_PASSNAME_COMBINED)) { - for (int alphaIndex = 0; alphaIndex < numberOfOutputs; alphaIndex++) { - NodeOutput *alphaSocket = this->getOutputSocket(alphaIndex); + for (NodeOutput *alphaSocket : getOutputSockets()) { bNodeSocket *bnodeAlphaSocket = alphaSocket->getbNodeSocket(); if (!STREQ(bnodeAlphaSocket->name, "Alpha")) { continue; @@ -204,12 +201,13 @@ void ImageNode::convertToOperations(NodeConverter &converter, /* without this, multilayer that fail to load will crash blender T32490. */ if (is_multilayer_ok == false) { - for (int i = 0; i < getNumberOfOutputSockets(); i++) { - converter.setInvalidOutput(getOutputSocket(i)); + for (NodeOutput *output : getOutputSockets()) { + converter.setInvalidOutput(output); } } } else { + const int64_t numberOfOutputs = getOutputSockets().size(); if (numberOfOutputs > 0) { ImageOperation *operation = new ImageOperation(); operation->setImage(image); @@ -296,4 +294,6 @@ void ImageNode::convertToOperations(NodeConverter &converter, } } } -} +} // namespace blender::compositor + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ImageNode.h b/source/blender/compositor/nodes/COM_ImageNode.h index b99fc07f105..047cc496f83 100644 --- a/source/blender/compositor/nodes/COM_ImageNode.h +++ b/source/blender/compositor/nodes/COM_ImageNode.h @@ -26,6 +26,8 @@ #include "RE_engine.h" #include "RE_pipeline.h" +namespace blender::compositor { + /** * \brief ImageNode * \ingroup Node @@ -44,5 +46,8 @@ class ImageNode : public Node { public: ImageNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_InpaintNode.cc b/source/blender/compositor/nodes/COM_InpaintNode.cc index 40fe63ec9f3..01ec5523939 100644 --- a/source/blender/compositor/nodes/COM_InpaintNode.cc +++ b/source/blender/compositor/nodes/COM_InpaintNode.cc @@ -22,6 +22,8 @@ #include "COM_InpaintOperation.h" #include "DNA_scene_types.h" +namespace blender::compositor { + InpaintNode::InpaintNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -43,3 +45,5 @@ void InpaintNode::convertToOperations(NodeConverter &converter, converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket(0)); } } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_InpaintNode.h b/source/blender/compositor/nodes/COM_InpaintNode.h index 3f778c8ba5c..3a10c11bf61 100644 --- a/source/blender/compositor/nodes/COM_InpaintNode.h +++ b/source/blender/compositor/nodes/COM_InpaintNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief InpaintNode * \ingroup Node @@ -27,5 +29,8 @@ class InpaintNode : public Node { public: InpaintNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_InvertNode.cc b/source/blender/compositor/nodes/COM_InvertNode.cc index 913452c42c8..5fe2033227f 100644 --- a/source/blender/compositor/nodes/COM_InvertNode.cc +++ b/source/blender/compositor/nodes/COM_InvertNode.cc @@ -21,6 +21,8 @@ #include "COM_ExecutionSystem.h" #include "COM_InvertOperation.h" +namespace blender::compositor { + InvertNode::InvertNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -39,3 +41,5 @@ void InvertNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(getInputSocket(1), operation->getInputSocket(1)); converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket(0)); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_InvertNode.h b/source/blender/compositor/nodes/COM_InvertNode.h index d90d6e48713..1cc975b8236 100644 --- a/source/blender/compositor/nodes/COM_InvertNode.h +++ b/source/blender/compositor/nodes/COM_InvertNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief InvertNode * \ingroup Node @@ -27,5 +29,8 @@ class InvertNode : public Node { public: InvertNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_KeyingNode.cc b/source/blender/compositor/nodes/COM_KeyingNode.cc index 9b493d3f332..2054ed67190 100644 --- a/source/blender/compositor/nodes/COM_KeyingNode.cc +++ b/source/blender/compositor/nodes/COM_KeyingNode.cc @@ -37,6 +37,8 @@ #include "COM_GaussianAlphaXBlurOperation.h" #include "COM_GaussianAlphaYBlurOperation.h" +namespace blender::compositor { + KeyingNode::KeyingNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -348,3 +350,5 @@ void KeyingNode::convertToOperations(NodeConverter &converter, converter.mapOutputSocket(outputEdges, edgesMatte); } } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_KeyingNode.h b/source/blender/compositor/nodes/COM_KeyingNode.h index 6920d2af09d..6d5e3ca1883 100644 --- a/source/blender/compositor/nodes/COM_KeyingNode.h +++ b/source/blender/compositor/nodes/COM_KeyingNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief KeyingNode * \ingroup Node @@ -55,5 +57,8 @@ class KeyingNode : public Node { public: KeyingNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_KeyingScreenNode.cc b/source/blender/compositor/nodes/COM_KeyingScreenNode.cc index 93a9a071226..cbe4f165a45 100644 --- a/source/blender/compositor/nodes/COM_KeyingScreenNode.cc +++ b/source/blender/compositor/nodes/COM_KeyingScreenNode.cc @@ -22,6 +22,8 @@ #include "DNA_movieclip_types.h" +namespace blender::compositor { + KeyingScreenNode::KeyingScreenNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -45,3 +47,5 @@ void KeyingScreenNode::convertToOperations(NodeConverter &converter, converter.mapOutputSocket(outputScreen, operation->getOutputSocket()); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_KeyingScreenNode.h b/source/blender/compositor/nodes/COM_KeyingScreenNode.h index ce9ef54543d..f2ad3b344f1 100644 --- a/source/blender/compositor/nodes/COM_KeyingScreenNode.h +++ b/source/blender/compositor/nodes/COM_KeyingScreenNode.h @@ -21,6 +21,8 @@ #include "COM_Node.h" #include "DNA_node_types.h" +namespace blender::compositor { + /** * \brief KeyingScreenNode * \ingroup Node @@ -28,5 +30,8 @@ class KeyingScreenNode : public Node { public: KeyingScreenNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_LensDistortionNode.cc b/source/blender/compositor/nodes/COM_LensDistortionNode.cc index 34d2fba6433..f5226d31989 100644 --- a/source/blender/compositor/nodes/COM_LensDistortionNode.cc +++ b/source/blender/compositor/nodes/COM_LensDistortionNode.cc @@ -21,6 +21,8 @@ #include "COM_ProjectorLensDistortionOperation.h" #include "COM_ScreenLensDistortionOperation.h" +namespace blender::compositor { + LensDistortionNode::LensDistortionNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -59,3 +61,5 @@ void LensDistortionNode::convertToOperations(NodeConverter &converter, converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket(0)); } } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_LensDistortionNode.h b/source/blender/compositor/nodes/COM_LensDistortionNode.h index 8df0e3f7df1..4de1b0fe4da 100644 --- a/source/blender/compositor/nodes/COM_LensDistortionNode.h +++ b/source/blender/compositor/nodes/COM_LensDistortionNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief LensDistortionNode * \ingroup Node @@ -27,5 +29,8 @@ class LensDistortionNode : public Node { public: LensDistortionNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_LuminanceMatteNode.cc b/source/blender/compositor/nodes/COM_LuminanceMatteNode.cc index 8bfea1eff49..920da53231f 100644 --- a/source/blender/compositor/nodes/COM_LuminanceMatteNode.cc +++ b/source/blender/compositor/nodes/COM_LuminanceMatteNode.cc @@ -22,6 +22,8 @@ #include "COM_LuminanceMatteOperation.h" #include "COM_SetAlphaMultiplyOperation.h" +namespace blender::compositor { + LuminanceMatteNode::LuminanceMatteNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -51,3 +53,5 @@ void LuminanceMatteNode::convertToOperations(NodeConverter &converter, converter.addPreview(operation->getOutputSocket()); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_LuminanceMatteNode.h b/source/blender/compositor/nodes/COM_LuminanceMatteNode.h index 7f2d9dfbe95..ef4ebc8ad92 100644 --- a/source/blender/compositor/nodes/COM_LuminanceMatteNode.h +++ b/source/blender/compositor/nodes/COM_LuminanceMatteNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief LuminanceMatteNode * \ingroup Node @@ -27,5 +29,8 @@ class LuminanceMatteNode : public Node { public: LuminanceMatteNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_MapRangeNode.cc b/source/blender/compositor/nodes/COM_MapRangeNode.cc index 352bc0dd48d..718a6d9e47b 100644 --- a/source/blender/compositor/nodes/COM_MapRangeNode.cc +++ b/source/blender/compositor/nodes/COM_MapRangeNode.cc @@ -21,6 +21,8 @@ #include "COM_ExecutionSystem.h" #include "COM_MapRangeOperation.h" +namespace blender::compositor { + MapRangeNode::MapRangeNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -47,3 +49,5 @@ void MapRangeNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(destMaxSocket, operation->getInputSocket(4)); converter.mapOutputSocket(outputSocket, operation->getOutputSocket(0)); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_MapRangeNode.h b/source/blender/compositor/nodes/COM_MapRangeNode.h index b838ea858ee..ad6fd78a7d5 100644 --- a/source/blender/compositor/nodes/COM_MapRangeNode.h +++ b/source/blender/compositor/nodes/COM_MapRangeNode.h @@ -20,6 +20,9 @@ #include "COM_Node.h" #include "DNA_node_types.h" + +namespace blender::compositor { + /** * \brief MapRangeNode * \ingroup Node @@ -27,5 +30,8 @@ class MapRangeNode : public Node { public: MapRangeNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_MapUVNode.cc b/source/blender/compositor/nodes/COM_MapUVNode.cc index feb9c75ec56..4b7a9e8af0f 100644 --- a/source/blender/compositor/nodes/COM_MapUVNode.cc +++ b/source/blender/compositor/nodes/COM_MapUVNode.cc @@ -20,6 +20,8 @@ #include "COM_ExecutionSystem.h" #include "COM_MapUVOperation.h" +namespace blender::compositor { + MapUVNode::MapUVNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -39,3 +41,5 @@ void MapUVNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(getInputSocket(1), operation->getInputSocket(1)); converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket()); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_MapUVNode.h b/source/blender/compositor/nodes/COM_MapUVNode.h index f9fc413dbe5..f7f4db167ea 100644 --- a/source/blender/compositor/nodes/COM_MapUVNode.h +++ b/source/blender/compositor/nodes/COM_MapUVNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief MapUVNode * \ingroup Node @@ -27,5 +29,8 @@ class MapUVNode : public Node { public: MapUVNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_MapValueNode.cc b/source/blender/compositor/nodes/COM_MapValueNode.cc index e07df8ad367..ae48bda6cb8 100644 --- a/source/blender/compositor/nodes/COM_MapValueNode.cc +++ b/source/blender/compositor/nodes/COM_MapValueNode.cc @@ -21,6 +21,8 @@ #include "COM_ExecutionSystem.h" #include "COM_MapValueOperation.h" +namespace blender::compositor { + MapValueNode::MapValueNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -41,3 +43,5 @@ void MapValueNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(colorSocket, convertProg->getInputSocket(0)); converter.mapOutputSocket(valueSocket, convertProg->getOutputSocket(0)); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_MapValueNode.h b/source/blender/compositor/nodes/COM_MapValueNode.h index 60ee262d447..dcac1d6e3c5 100644 --- a/source/blender/compositor/nodes/COM_MapValueNode.h +++ b/source/blender/compositor/nodes/COM_MapValueNode.h @@ -20,6 +20,9 @@ #include "COM_Node.h" #include "DNA_node_types.h" + +namespace blender::compositor { + /** * \brief MapValueNode * \ingroup Node @@ -27,5 +30,8 @@ class MapValueNode : public Node { public: MapValueNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_MaskNode.cc b/source/blender/compositor/nodes/COM_MaskNode.cc index a6415a3992e..ef171c01653 100644 --- a/source/blender/compositor/nodes/COM_MaskNode.cc +++ b/source/blender/compositor/nodes/COM_MaskNode.cc @@ -22,6 +22,8 @@ #include "DNA_mask_types.h" +namespace blender::compositor { + MaskNode::MaskNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -68,3 +70,5 @@ void MaskNode::convertToOperations(NodeConverter &converter, converter.addOperation(operation); converter.mapOutputSocket(outputMask, operation->getOutputSocket()); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_MaskNode.h b/source/blender/compositor/nodes/COM_MaskNode.h index 4a03916b3c2..5890cf5957a 100644 --- a/source/blender/compositor/nodes/COM_MaskNode.h +++ b/source/blender/compositor/nodes/COM_MaskNode.h @@ -21,6 +21,8 @@ #include "COM_Node.h" #include "DNA_node_types.h" +namespace blender::compositor { + /** * \brief MaskNode * \ingroup Node @@ -28,5 +30,8 @@ class MaskNode : public Node { public: MaskNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_MathNode.cc b/source/blender/compositor/nodes/COM_MathNode.cc index 0edf880400f..dd0d8931d58 100644 --- a/source/blender/compositor/nodes/COM_MathNode.cc +++ b/source/blender/compositor/nodes/COM_MathNode.cc @@ -20,6 +20,8 @@ #include "COM_ExecutionSystem.h" #include "COM_MathBaseOperation.h" +namespace blender::compositor { + void MathNode::convertToOperations(NodeConverter &converter, const CompositorContext & /*context*/) const { @@ -159,3 +161,5 @@ void MathNode::convertToOperations(NodeConverter &converter, converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket()); } } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_MathNode.h b/source/blender/compositor/nodes/COM_MathNode.h index 41b144679ac..5db59e62bab 100644 --- a/source/blender/compositor/nodes/COM_MathNode.h +++ b/source/blender/compositor/nodes/COM_MathNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief MathNode * \ingroup Node @@ -29,5 +31,8 @@ class MathNode : public Node { MathNode(bNode *editorNode) : Node(editorNode) { } - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_MixNode.cc b/source/blender/compositor/nodes/COM_MixNode.cc index d082590d21b..cfa8d0ee6a6 100644 --- a/source/blender/compositor/nodes/COM_MixNode.cc +++ b/source/blender/compositor/nodes/COM_MixNode.cc @@ -24,6 +24,8 @@ #include "COM_SetValueOperation.h" #include "DNA_material_types.h" /* the ramp types */ +namespace blender::compositor { + MixNode::MixNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -110,3 +112,5 @@ void MixNode::convertToOperations(NodeConverter &converter, converter.addPreview(convertProg->getOutputSocket(0)); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_MixNode.h b/source/blender/compositor/nodes/COM_MixNode.h index 91ce29fdbf2..81f9c41871e 100644 --- a/source/blender/compositor/nodes/COM_MixNode.h +++ b/source/blender/compositor/nodes/COM_MixNode.h @@ -20,6 +20,9 @@ #include "COM_Node.h" #include "DNA_node_types.h" + +namespace blender::compositor { + /** * \brief MixNode * \ingroup Node @@ -27,5 +30,8 @@ class MixNode : public Node { public: MixNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_MovieClipNode.cc b/source/blender/compositor/nodes/COM_MovieClipNode.cc index 7cc8f2ea19c..50bd9b4d71b 100644 --- a/source/blender/compositor/nodes/COM_MovieClipNode.cc +++ b/source/blender/compositor/nodes/COM_MovieClipNode.cc @@ -29,6 +29,8 @@ #include "IMB_imbuf.h" +namespace blender::compositor { + MovieClipNode::MovieClipNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -106,3 +108,5 @@ void MovieClipNode::convertToOperations(NodeConverter &converter, IMB_freeImBuf(ibuf); } } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_MovieClipNode.h b/source/blender/compositor/nodes/COM_MovieClipNode.h index 58262592dca..a469ce9e2a4 100644 --- a/source/blender/compositor/nodes/COM_MovieClipNode.h +++ b/source/blender/compositor/nodes/COM_MovieClipNode.h @@ -21,6 +21,8 @@ #include "COM_Node.h" #include "DNA_node_types.h" +namespace blender::compositor { + /** * \brief MovieClipNode * \ingroup Node @@ -28,5 +30,8 @@ class MovieClipNode : public Node { public: MovieClipNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_MovieDistortionNode.cc b/source/blender/compositor/nodes/COM_MovieDistortionNode.cc index ebace6d5fff..8f17ef8bb98 100644 --- a/source/blender/compositor/nodes/COM_MovieDistortionNode.cc +++ b/source/blender/compositor/nodes/COM_MovieDistortionNode.cc @@ -22,6 +22,8 @@ #include "COM_MovieDistortionOperation.h" #include "DNA_movieclip_types.h" +namespace blender::compositor { + MovieDistortionNode::MovieDistortionNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -44,3 +46,5 @@ void MovieDistortionNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(inputSocket, operation->getInputSocket(0)); converter.mapOutputSocket(outputSocket, operation->getOutputSocket(0)); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_MovieDistortionNode.h b/source/blender/compositor/nodes/COM_MovieDistortionNode.h index f4df48dac13..0c1610aa3d3 100644 --- a/source/blender/compositor/nodes/COM_MovieDistortionNode.h +++ b/source/blender/compositor/nodes/COM_MovieDistortionNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief MovieDistortionNode * \ingroup Node @@ -27,5 +29,8 @@ class MovieDistortionNode : public Node { public: MovieDistortionNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_NormalNode.cc b/source/blender/compositor/nodes/COM_NormalNode.cc index 1f48a26fd75..5a97b0932ef 100644 --- a/source/blender/compositor/nodes/COM_NormalNode.cc +++ b/source/blender/compositor/nodes/COM_NormalNode.cc @@ -22,6 +22,8 @@ #include "COM_ExecutionSystem.h" #include "COM_SetVectorOperation.h" +namespace blender::compositor { + NormalNode::NormalNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -54,3 +56,5 @@ void NormalNode::convertToOperations(NodeConverter &converter, converter.addLink(operationSet->getOutputSocket(0), operation->getInputSocket(1)); converter.mapOutputSocket(outputSocketDotproduct, operation->getOutputSocket(0)); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_NormalNode.h b/source/blender/compositor/nodes/COM_NormalNode.h index c23e83fb023..6d5cbb394a0 100644 --- a/source/blender/compositor/nodes/COM_NormalNode.h +++ b/source/blender/compositor/nodes/COM_NormalNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief NormalNode * \ingroup Node @@ -27,5 +29,8 @@ class NormalNode : public Node { public: NormalNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_NormalizeNode.cc b/source/blender/compositor/nodes/COM_NormalizeNode.cc index 72459fd477c..639dd8e5a51 100644 --- a/source/blender/compositor/nodes/COM_NormalizeNode.cc +++ b/source/blender/compositor/nodes/COM_NormalizeNode.cc @@ -20,6 +20,8 @@ #include "COM_ExecutionSystem.h" #include "COM_NormalizeOperation.h" +namespace blender::compositor { + NormalizeNode::NormalizeNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -34,3 +36,5 @@ void NormalizeNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(getInputSocket(0), operation->getInputSocket(0)); converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket(0)); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_NormalizeNode.h b/source/blender/compositor/nodes/COM_NormalizeNode.h index 7e53ac7e9a0..7770fc49b61 100644 --- a/source/blender/compositor/nodes/COM_NormalizeNode.h +++ b/source/blender/compositor/nodes/COM_NormalizeNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief NormalizeNode * \ingroup Node @@ -27,5 +29,8 @@ class NormalizeNode : public Node { public: NormalizeNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_OutputFileNode.cc b/source/blender/compositor/nodes/COM_OutputFileNode.cc index dcc1fbdec67..10f176d71f5 100644 --- a/source/blender/compositor/nodes/COM_OutputFileNode.cc +++ b/source/blender/compositor/nodes/COM_OutputFileNode.cc @@ -25,6 +25,8 @@ #include "BLI_path_util.h" +namespace blender::compositor { + OutputFileNode::OutputFileNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -69,17 +71,16 @@ void OutputFileNode::convertToOperations(NodeConverter &converter, } converter.addOperation(outputOperation); - int num_inputs = getNumberOfInputSockets(); bool previewAdded = false; - for (int i = 0; i < num_inputs; i++) { - NodeInput *input = getInputSocket(i); + int index = 0; + for (NodeInput *input : inputs) { NodeImageMultiFileSocket *sockdata = (NodeImageMultiFileSocket *)input->getbNodeSocket()->storage; /* note: layer becomes an empty placeholder if the input is not linked */ outputOperation->add_layer(sockdata->layer, input->getDataType(), input->isLinked()); - converter.mapInputSocket(input, outputOperation->getInputSocket(i)); + converter.mapInputSocket(input, outputOperation->getInputSocket(index++)); if (!previewAdded) { converter.addNodeInputPreview(input); @@ -88,10 +89,8 @@ void OutputFileNode::convertToOperations(NodeConverter &converter, } } else { /* single layer format */ - int num_inputs = getNumberOfInputSockets(); bool previewAdded = false; - for (int i = 0; i < num_inputs; i++) { - NodeInput *input = getInputSocket(i); + for (NodeInput *input : inputs) { if (input->isLinked()) { NodeImageMultiFileSocket *sockdata = (NodeImageMultiFileSocket *)input->getbNodeSocket()->storage; @@ -151,3 +150,5 @@ void OutputFileNode::convertToOperations(NodeConverter &converter, } } } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_OutputFileNode.h b/source/blender/compositor/nodes/COM_OutputFileNode.h index 037a345fa50..d1826797c6e 100644 --- a/source/blender/compositor/nodes/COM_OutputFileNode.h +++ b/source/blender/compositor/nodes/COM_OutputFileNode.h @@ -21,6 +21,8 @@ #include "COM_Node.h" #include "DNA_node_types.h" +namespace blender::compositor { + /** * \brief OutputFileNode * \ingroup Node @@ -28,5 +30,8 @@ class OutputFileNode : public Node { public: OutputFileNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_PixelateNode.cc b/source/blender/compositor/nodes/COM_PixelateNode.cc index f238f68727e..396f339e5a2 100644 --- a/source/blender/compositor/nodes/COM_PixelateNode.cc +++ b/source/blender/compositor/nodes/COM_PixelateNode.cc @@ -21,6 +21,8 @@ #include "COM_ExecutionSystem.h" #include "COM_PixelateOperation.h" +namespace blender::compositor { + PixelateNode::PixelateNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -44,3 +46,5 @@ void PixelateNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(inputSocket, operation->getInputSocket(0)); converter.mapOutputSocket(outputSocket, operation->getOutputSocket(0)); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_PixelateNode.h b/source/blender/compositor/nodes/COM_PixelateNode.h index 87cb4df59e8..1a6555550cf 100644 --- a/source/blender/compositor/nodes/COM_PixelateNode.h +++ b/source/blender/compositor/nodes/COM_PixelateNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief PixelateNode * \ingroup Node @@ -27,5 +29,8 @@ class PixelateNode : public Node { public: PixelateNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cc b/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cc index 6b9b51631ec..54a0f4d0452 100644 --- a/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cc +++ b/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cc @@ -25,6 +25,8 @@ #include "BKE_node.h" #include "BKE_tracking.h" +namespace blender::compositor { + PlaneTrackDeformNode::PlaneTrackDeformNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -70,3 +72,5 @@ void PlaneTrackDeformNode::convertToOperations(NodeConverter &converter, converter.mapOutputSocket(output_plane, plane_mask_operation->getOutputSocket()); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h b/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h index 36844bc1650..307738fcaf0 100644 --- a/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h +++ b/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h @@ -23,6 +23,8 @@ #include "DNA_movieclip_types.h" #include "DNA_node_types.h" +namespace blender::compositor { + /** * \brief PlaneTrackDeformNode * \ingroup Node @@ -30,5 +32,8 @@ class PlaneTrackDeformNode : public Node { public: PlaneTrackDeformNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_RenderLayersNode.cc b/source/blender/compositor/nodes/COM_RenderLayersNode.cc index ea3eeb13393..851d0366546 100644 --- a/source/blender/compositor/nodes/COM_RenderLayersNode.cc +++ b/source/blender/compositor/nodes/COM_RenderLayersNode.cc @@ -25,6 +25,8 @@ #include "COM_SetVectorOperation.h" #include "COM_TranslateOperation.h" +namespace blender::compositor { + RenderLayersNode::RenderLayersNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -72,9 +74,8 @@ void RenderLayersNode::testRenderLink(NodeConverter &converter, missingRenderLink(converter); return; } - const int num_outputs = this->getNumberOfOutputSockets(); - for (int i = 0; i < num_outputs; i++) { - NodeOutput *output = this->getOutputSocket(i); + + for (NodeOutput *output : getOutputSockets()) { NodeImageLayer *storage = (NodeImageLayer *)output->getbNodeSocket()->storage; RenderPass *rpass = (RenderPass *)BLI_findstring( &rl->passes, storage->pass_name, offsetof(RenderPass, name)); @@ -153,9 +154,7 @@ void RenderLayersNode::missingSocketLink(NodeConverter &converter, NodeOutput *o void RenderLayersNode::missingRenderLink(NodeConverter &converter) const { - const int num_outputs = this->getNumberOfOutputSockets(); - for (int i = 0; i < num_outputs; i++) { - NodeOutput *output = this->getOutputSocket(i); + for (NodeOutput *output : outputs) { missingSocketLink(converter, output); } } @@ -174,3 +173,5 @@ void RenderLayersNode::convertToOperations(NodeConverter &converter, missingRenderLink(converter); } } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_RenderLayersNode.h b/source/blender/compositor/nodes/COM_RenderLayersNode.h index 1ffd084ad1e..4eb2427c8e0 100644 --- a/source/blender/compositor/nodes/COM_RenderLayersNode.h +++ b/source/blender/compositor/nodes/COM_RenderLayersNode.h @@ -23,6 +23,7 @@ #include "DNA_node_types.h" struct Render; +namespace blender::compositor { /** * \brief RenderLayersNode @@ -31,7 +32,8 @@ struct Render; class RenderLayersNode : public Node { public: RenderLayersNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; private: void testSocketLink(NodeConverter &converter, @@ -48,3 +50,5 @@ class RenderLayersNode : public Node { void missingSocketLink(NodeConverter &converter, NodeOutput *output) const; void missingRenderLink(NodeConverter &converter) const; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_RotateNode.cc b/source/blender/compositor/nodes/COM_RotateNode.cc index cbade778bcb..af5baa733dc 100644 --- a/source/blender/compositor/nodes/COM_RotateNode.cc +++ b/source/blender/compositor/nodes/COM_RotateNode.cc @@ -22,6 +22,8 @@ #include "COM_RotateOperation.h" #include "COM_SetSamplerOperation.h" +namespace blender::compositor { + RotateNode::RotateNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -45,3 +47,5 @@ void RotateNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(inputDegreeSocket, operation->getInputSocket(1)); converter.mapOutputSocket(outputSocket, operation->getOutputSocket(0)); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_RotateNode.h b/source/blender/compositor/nodes/COM_RotateNode.h index b75fdd52683..5d8bcb2e3e4 100644 --- a/source/blender/compositor/nodes/COM_RotateNode.h +++ b/source/blender/compositor/nodes/COM_RotateNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief RotateNode * \ingroup Node @@ -27,5 +29,8 @@ class RotateNode : public Node { public: RotateNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ScaleNode.cc b/source/blender/compositor/nodes/COM_ScaleNode.cc index 9ffcd5306b0..50d2902f375 100644 --- a/source/blender/compositor/nodes/COM_ScaleNode.cc +++ b/source/blender/compositor/nodes/COM_ScaleNode.cc @@ -24,6 +24,8 @@ #include "COM_SetSamplerOperation.h" #include "COM_SetValueOperation.h" +namespace blender::compositor { + ScaleNode::ScaleNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -79,7 +81,7 @@ void ScaleNode::convertToOperations(NodeConverter &converter, operation->setOffset(bnode->custom3, bnode->custom4); operation->setNewWidth(rd->xsch * render_size_factor); operation->setNewHeight(rd->ysch * render_size_factor); - operation->getInputSocket(0)->setResizeMode(COM_SC_NO_RESIZE); + operation->getInputSocket(0)->setResizeMode(ResizeMode::None); converter.addOperation(operation); converter.mapInputSocket(inputSocket, operation->getInputSocket(0)); @@ -105,3 +107,5 @@ void ScaleNode::convertToOperations(NodeConverter &converter, } } } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ScaleNode.h b/source/blender/compositor/nodes/COM_ScaleNode.h index c9a02411b1c..186ffa8bdce 100644 --- a/source/blender/compositor/nodes/COM_ScaleNode.h +++ b/source/blender/compositor/nodes/COM_ScaleNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief ScaleNode * \ingroup Node @@ -27,5 +29,8 @@ class ScaleNode : public Node { public: ScaleNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_SeparateColorNode.cc b/source/blender/compositor/nodes/COM_SeparateColorNode.cc index 203aa25c9e9..fcaf52c701d 100644 --- a/source/blender/compositor/nodes/COM_SeparateColorNode.cc +++ b/source/blender/compositor/nodes/COM_SeparateColorNode.cc @@ -20,6 +20,8 @@ #include "COM_ConvertOperation.h" +namespace blender::compositor { + SeparateColorNode::SeparateColorNode(bNode *editorNode) : Node(editorNode) { } @@ -119,3 +121,5 @@ NodeOperation *SeparateYUVANode::getColorConverter(const CompositorContext & /*c { return new ConvertRGBToYUVOperation(); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_SeparateColorNode.h b/source/blender/compositor/nodes/COM_SeparateColorNode.h index aaf86c6e22b..eaf543df51f 100644 --- a/source/blender/compositor/nodes/COM_SeparateColorNode.h +++ b/source/blender/compositor/nodes/COM_SeparateColorNode.h @@ -20,10 +20,13 @@ #include "COM_Node.h" +namespace blender::compositor { + class SeparateColorNode : public Node { public: SeparateColorNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; protected: virtual NodeOperation *getColorConverter(const CompositorContext &context) const = 0; @@ -35,7 +38,7 @@ class SeparateRGBANode : public SeparateColorNode { { } - NodeOperation *getColorConverter(const CompositorContext &context) const; + NodeOperation *getColorConverter(const CompositorContext &context) const override; }; class SeparateHSVANode : public SeparateColorNode { @@ -44,7 +47,7 @@ class SeparateHSVANode : public SeparateColorNode { { } - NodeOperation *getColorConverter(const CompositorContext &context) const; + NodeOperation *getColorConverter(const CompositorContext &context) const override; }; class SeparateYCCANode : public SeparateColorNode { @@ -53,7 +56,7 @@ class SeparateYCCANode : public SeparateColorNode { { } - NodeOperation *getColorConverter(const CompositorContext &context) const; + NodeOperation *getColorConverter(const CompositorContext &context) const override; }; class SeparateYUVANode : public SeparateColorNode { @@ -62,5 +65,7 @@ class SeparateYUVANode : public SeparateColorNode { { } - NodeOperation *getColorConverter(const CompositorContext &context) const; + NodeOperation *getColorConverter(const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_SetAlphaNode.cc b/source/blender/compositor/nodes/COM_SetAlphaNode.cc index 233a5e96ff4..dc41c126ba8 100644 --- a/source/blender/compositor/nodes/COM_SetAlphaNode.cc +++ b/source/blender/compositor/nodes/COM_SetAlphaNode.cc @@ -21,6 +21,8 @@ #include "COM_SetAlphaMultiplyOperation.h" #include "COM_SetAlphaReplaceOperation.h" +namespace blender::compositor { + void SetAlphaNode::convertToOperations(NodeConverter &converter, const CompositorContext & /*context*/) const { @@ -46,3 +48,5 @@ void SetAlphaNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(getInputSocket(1), operation->getInputSocket(1)); converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket()); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_SetAlphaNode.h b/source/blender/compositor/nodes/COM_SetAlphaNode.h index 2e652539cec..c8d340eb64b 100644 --- a/source/blender/compositor/nodes/COM_SetAlphaNode.h +++ b/source/blender/compositor/nodes/COM_SetAlphaNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief SetAlphaNode * \ingroup Node @@ -29,5 +31,8 @@ class SetAlphaNode : public Node { SetAlphaNode(bNode *editorNode) : Node(editorNode) { } - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_SocketProxyNode.cc b/source/blender/compositor/nodes/COM_SocketProxyNode.cc index 93d8d399cad..b3aa1770551 100644 --- a/source/blender/compositor/nodes/COM_SocketProxyNode.cc +++ b/source/blender/compositor/nodes/COM_SocketProxyNode.cc @@ -25,6 +25,8 @@ #include "COM_SocketProxyOperation.h" #include "COM_WriteBufferOperation.h" +namespace blender::compositor { + SocketProxyNode::SocketProxyNode(bNode *editorNode, bNodeSocket *editorInput, bNodeSocket *editorOutput, @@ -101,3 +103,5 @@ void SocketBufferNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(input, writeOperation->getInputSocket(0)); converter.mapOutputSocket(output, readOperation->getOutputSocket()); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_SocketProxyNode.h b/source/blender/compositor/nodes/COM_SocketProxyNode.h index a0c0b63dafd..d19fb802767 100644 --- a/source/blender/compositor/nodes/COM_SocketProxyNode.h +++ b/source/blender/compositor/nodes/COM_SocketProxyNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief SocketProxyNode * \ingroup Node @@ -30,7 +32,8 @@ class SocketProxyNode : public Node { bNodeSocket *editorInput, bNodeSocket *editorOutput, bool use_conversion); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; bool getUseConversion() const { @@ -49,5 +52,8 @@ class SocketProxyNode : public Node { class SocketBufferNode : public Node { public: SocketBufferNode(bNode *editorNode, bNodeSocket *editorInput, bNodeSocket *editorOutput); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_SplitViewerNode.cc b/source/blender/compositor/nodes/COM_SplitViewerNode.cc index 681adeaf1d3..582c650f205 100644 --- a/source/blender/compositor/nodes/COM_SplitViewerNode.cc +++ b/source/blender/compositor/nodes/COM_SplitViewerNode.cc @@ -25,6 +25,8 @@ #include "COM_SplitOperation.h" #include "COM_ViewerOperation.h" +namespace blender::compositor { + SplitViewerNode::SplitViewerNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -73,3 +75,5 @@ void SplitViewerNode::convertToOperations(NodeConverter &converter, converter.registerViewer(viewerOperation); } } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_SplitViewerNode.h b/source/blender/compositor/nodes/COM_SplitViewerNode.h index c9ce5164ef4..8a42775eb0d 100644 --- a/source/blender/compositor/nodes/COM_SplitViewerNode.h +++ b/source/blender/compositor/nodes/COM_SplitViewerNode.h @@ -20,6 +20,9 @@ #include "COM_Node.h" #include "DNA_node_types.h" + +namespace blender::compositor { + /** * \brief SplitViewerNode * \ingroup Node @@ -27,5 +30,8 @@ class SplitViewerNode : public Node { public: SplitViewerNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_Stabilize2dNode.cc b/source/blender/compositor/nodes/COM_Stabilize2dNode.cc index 38db080a154..fc72b48eca2 100644 --- a/source/blender/compositor/nodes/COM_Stabilize2dNode.cc +++ b/source/blender/compositor/nodes/COM_Stabilize2dNode.cc @@ -28,6 +28,8 @@ #include "DNA_movieclip_types.h" +namespace blender::compositor { + Stabilize2dNode::Stabilize2dNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -111,3 +113,5 @@ void Stabilize2dNode::convertToOperations(NodeConverter &converter, converter.addLink(translateOperation->getOutputSocket(), psoperation->getInputSocket(0)); } } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_Stabilize2dNode.h b/source/blender/compositor/nodes/COM_Stabilize2dNode.h index cb46926a3f3..34ed8871e33 100644 --- a/source/blender/compositor/nodes/COM_Stabilize2dNode.h +++ b/source/blender/compositor/nodes/COM_Stabilize2dNode.h @@ -21,6 +21,8 @@ #include "COM_Node.h" #include "DNA_node_types.h" +namespace blender::compositor { + /** * \brief Stabilize2dNode * \ingroup Node @@ -28,5 +30,8 @@ class Stabilize2dNode : public Node { public: Stabilize2dNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_SunBeamsNode.cc b/source/blender/compositor/nodes/COM_SunBeamsNode.cc index d899a54c03c..1e5aa0b8020 100644 --- a/source/blender/compositor/nodes/COM_SunBeamsNode.cc +++ b/source/blender/compositor/nodes/COM_SunBeamsNode.cc @@ -18,6 +18,8 @@ #include "COM_SunBeamsNode.h" #include "COM_SunBeamsOperation.h" +namespace blender::compositor { + SunBeamsNode::SunBeamsNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -37,3 +39,5 @@ void SunBeamsNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(inputSocket, operation->getInputSocket(0)); converter.mapOutputSocket(outputSocket, operation->getOutputSocket(0)); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_SunBeamsNode.h b/source/blender/compositor/nodes/COM_SunBeamsNode.h index 9a56fc1fcea..8b68d3f4cb5 100644 --- a/source/blender/compositor/nodes/COM_SunBeamsNode.h +++ b/source/blender/compositor/nodes/COM_SunBeamsNode.h @@ -19,6 +19,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief SunBeamsNode * \ingroup Node @@ -26,5 +28,8 @@ class SunBeamsNode : public Node { public: SunBeamsNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_SwitchNode.cc b/source/blender/compositor/nodes/COM_SwitchNode.cc index 947774e98ae..4006d10dafb 100644 --- a/source/blender/compositor/nodes/COM_SwitchNode.cc +++ b/source/blender/compositor/nodes/COM_SwitchNode.cc @@ -18,6 +18,8 @@ #include "COM_SwitchNode.h" +namespace blender::compositor { + SwitchNode::SwitchNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -38,3 +40,5 @@ void SwitchNode::convertToOperations(NodeConverter &converter, converter.mapOutputSocket(getOutputSocket(0), result); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_SwitchNode.h b/source/blender/compositor/nodes/COM_SwitchNode.h index d4d8dd23a98..aa6caa2e59f 100644 --- a/source/blender/compositor/nodes/COM_SwitchNode.h +++ b/source/blender/compositor/nodes/COM_SwitchNode.h @@ -21,6 +21,9 @@ #include "COM_Node.h" #include "COM_NodeOperation.h" #include "DNA_node_types.h" + +namespace blender::compositor { + /** * \brief SwitchNode * \ingroup Node @@ -28,5 +31,8 @@ class SwitchNode : public Node { public: SwitchNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_SwitchViewNode.cc b/source/blender/compositor/nodes/COM_SwitchViewNode.cc index e534ebfac9a..395122dd11b 100644 --- a/source/blender/compositor/nodes/COM_SwitchViewNode.cc +++ b/source/blender/compositor/nodes/COM_SwitchViewNode.cc @@ -19,6 +19,8 @@ #include "COM_SwitchViewNode.h" #include "BLI_listbase.h" +namespace blender::compositor { + SwitchViewNode::SwitchViewNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -38,3 +40,5 @@ void SwitchViewNode::convertToOperations(NodeConverter &converter, result = converter.addInputProxy(getInputSocket(nr), false); converter.mapOutputSocket(getOutputSocket(0), result); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_SwitchViewNode.h b/source/blender/compositor/nodes/COM_SwitchViewNode.h index 9423740f668..ce6de52182c 100644 --- a/source/blender/compositor/nodes/COM_SwitchViewNode.h +++ b/source/blender/compositor/nodes/COM_SwitchViewNode.h @@ -21,6 +21,9 @@ #include "COM_Node.h" #include "COM_NodeOperation.h" #include "DNA_node_types.h" + +namespace blender::compositor { + /** * \brief SwitchViewNode * \ingroup Node @@ -28,5 +31,8 @@ class SwitchViewNode : public Node { public: SwitchViewNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_TextureNode.cc b/source/blender/compositor/nodes/COM_TextureNode.cc index 3381b5098d7..317355b8c9a 100644 --- a/source/blender/compositor/nodes/COM_TextureNode.cc +++ b/source/blender/compositor/nodes/COM_TextureNode.cc @@ -20,6 +20,8 @@ #include "COM_ExecutionSystem.h" #include "COM_TextureOperation.h" +namespace blender::compositor { + TextureNode::TextureNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -54,3 +56,5 @@ void TextureNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(getInputSocket(1), alphaOperation->getInputSocket(1)); converter.mapOutputSocket(getOutputSocket(0), alphaOperation->getOutputSocket()); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_TextureNode.h b/source/blender/compositor/nodes/COM_TextureNode.h index 4d780850190..b886e3b74e1 100644 --- a/source/blender/compositor/nodes/COM_TextureNode.h +++ b/source/blender/compositor/nodes/COM_TextureNode.h @@ -21,6 +21,8 @@ #include "COM_Node.h" #include "DNA_node_types.h" +namespace blender::compositor { + /** * \brief TextureNode * \ingroup Node @@ -28,5 +30,8 @@ class TextureNode : public Node { public: TextureNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_TimeNode.cc b/source/blender/compositor/nodes/COM_TimeNode.cc index 247e0d11df6..c14c5344eee 100644 --- a/source/blender/compositor/nodes/COM_TimeNode.cc +++ b/source/blender/compositor/nodes/COM_TimeNode.cc @@ -24,6 +24,8 @@ #include "BLI_utildefines.h" +namespace blender::compositor { + TimeNode::TimeNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -56,3 +58,5 @@ void TimeNode::convertToOperations(NodeConverter &converter, converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket()); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_TimeNode.h b/source/blender/compositor/nodes/COM_TimeNode.h index 78177014dc1..5688e2cff03 100644 --- a/source/blender/compositor/nodes/COM_TimeNode.h +++ b/source/blender/compositor/nodes/COM_TimeNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief TimeNode * \ingroup Node @@ -27,5 +29,8 @@ class TimeNode : public Node { public: TimeNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_TonemapNode.cc b/source/blender/compositor/nodes/COM_TonemapNode.cc index db329e56f9b..844fe3e8cb6 100644 --- a/source/blender/compositor/nodes/COM_TonemapNode.cc +++ b/source/blender/compositor/nodes/COM_TonemapNode.cc @@ -20,6 +20,8 @@ #include "COM_ExecutionSystem.h" #include "COM_TonemapOperation.h" +namespace blender::compositor { + TonemapNode::TonemapNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -38,3 +40,5 @@ void TonemapNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(getInputSocket(0), operation->getInputSocket(0)); converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket(0)); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_TonemapNode.h b/source/blender/compositor/nodes/COM_TonemapNode.h index d934a1ede5b..cac9004c32a 100644 --- a/source/blender/compositor/nodes/COM_TonemapNode.h +++ b/source/blender/compositor/nodes/COM_TonemapNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief TonemapNode * \ingroup Node @@ -27,5 +29,8 @@ class TonemapNode : public Node { public: TonemapNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_TrackPositionNode.cc b/source/blender/compositor/nodes/COM_TrackPositionNode.cc index 52e7f7d832b..3fb5fc02f20 100644 --- a/source/blender/compositor/nodes/COM_TrackPositionNode.cc +++ b/source/blender/compositor/nodes/COM_TrackPositionNode.cc @@ -26,6 +26,8 @@ #include "BKE_node.h" +namespace blender::compositor { + TrackPositionNode::TrackPositionNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -109,3 +111,5 @@ void TrackPositionNode::convertToOperations(NodeConverter &converter, converter.addLink(operationMotionPostY->getOutputSocket(), combine_operation->getInputSocket(3)); converter.mapOutputSocket(outputSpeed, combine_operation->getOutputSocket()); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_TrackPositionNode.h b/source/blender/compositor/nodes/COM_TrackPositionNode.h index 37d3d25d592..665ba36fe09 100644 --- a/source/blender/compositor/nodes/COM_TrackPositionNode.h +++ b/source/blender/compositor/nodes/COM_TrackPositionNode.h @@ -21,6 +21,8 @@ #include "COM_Node.h" #include "DNA_node_types.h" +namespace blender::compositor { + /** * \brief TrackPositionNode * \ingroup Node @@ -28,5 +30,8 @@ class TrackPositionNode : public Node { public: TrackPositionNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_TransformNode.cc b/source/blender/compositor/nodes/COM_TransformNode.cc index cd5ba8ba201..cd12939ab43 100644 --- a/source/blender/compositor/nodes/COM_TransformNode.cc +++ b/source/blender/compositor/nodes/COM_TransformNode.cc @@ -24,6 +24,8 @@ #include "COM_SetValueOperation.h" #include "COM_TranslateOperation.h" +namespace blender::compositor { + TransformNode::TransformNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -66,3 +68,5 @@ void TransformNode::convertToOperations(NodeConverter &converter, converter.mapOutputSocket(getOutputSocket(), translateOperation->getOutputSocket()); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_TransformNode.h b/source/blender/compositor/nodes/COM_TransformNode.h index bd01808d662..137e162256d 100644 --- a/source/blender/compositor/nodes/COM_TransformNode.h +++ b/source/blender/compositor/nodes/COM_TransformNode.h @@ -21,6 +21,8 @@ #include "COM_Node.h" #include "DNA_node_types.h" +namespace blender::compositor { + /** * \brief TransformNode * \ingroup Node @@ -28,5 +30,8 @@ class TransformNode : public Node { public: TransformNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_TranslateNode.cc b/source/blender/compositor/nodes/COM_TranslateNode.cc index 13a73953ea0..922393f006a 100644 --- a/source/blender/compositor/nodes/COM_TranslateNode.cc +++ b/source/blender/compositor/nodes/COM_TranslateNode.cc @@ -23,6 +23,8 @@ #include "COM_WrapOperation.h" #include "COM_WriteBufferOperation.h" +namespace blender::compositor { + TranslateNode::TranslateNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -69,3 +71,5 @@ void TranslateNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(inputSocket, operation->getInputSocket(0)); } } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_TranslateNode.h b/source/blender/compositor/nodes/COM_TranslateNode.h index d381274c0e5..0cea234bff8 100644 --- a/source/blender/compositor/nodes/COM_TranslateNode.h +++ b/source/blender/compositor/nodes/COM_TranslateNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief TranslateNode * \ingroup Node @@ -27,5 +29,8 @@ class TranslateNode : public Node { public: TranslateNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ValueNode.cc b/source/blender/compositor/nodes/COM_ValueNode.cc index 4227db0d10e..6b640fa2a3a 100644 --- a/source/blender/compositor/nodes/COM_ValueNode.cc +++ b/source/blender/compositor/nodes/COM_ValueNode.cc @@ -20,6 +20,8 @@ #include "COM_ExecutionSystem.h" #include "COM_SetValueOperation.h" +namespace blender::compositor { + ValueNode::ValueNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -35,3 +37,5 @@ void ValueNode::convertToOperations(NodeConverter &converter, converter.mapOutputSocket(output, operation->getOutputSocket()); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ValueNode.h b/source/blender/compositor/nodes/COM_ValueNode.h index 5179e6828e4..1401b2c7e0a 100644 --- a/source/blender/compositor/nodes/COM_ValueNode.h +++ b/source/blender/compositor/nodes/COM_ValueNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief ValueNode * \ingroup Node @@ -27,5 +29,8 @@ class ValueNode : public Node { public: ValueNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_VectorBlurNode.cc b/source/blender/compositor/nodes/COM_VectorBlurNode.cc index a92991c8b49..7aa5f5668c9 100644 --- a/source/blender/compositor/nodes/COM_VectorBlurNode.cc +++ b/source/blender/compositor/nodes/COM_VectorBlurNode.cc @@ -20,6 +20,8 @@ #include "COM_VectorBlurOperation.h" #include "DNA_node_types.h" +namespace blender::compositor { + VectorBlurNode::VectorBlurNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -41,3 +43,5 @@ void VectorBlurNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(getInputSocket(2), operation->getInputSocket(2)); converter.mapOutputSocket(getOutputSocket(), operation->getOutputSocket()); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_VectorBlurNode.h b/source/blender/compositor/nodes/COM_VectorBlurNode.h index f370c82a1ee..8c98a0b81a1 100644 --- a/source/blender/compositor/nodes/COM_VectorBlurNode.h +++ b/source/blender/compositor/nodes/COM_VectorBlurNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief VectorBlurNode * \ingroup Node @@ -27,5 +29,8 @@ class VectorBlurNode : public Node { public: VectorBlurNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_VectorCurveNode.cc b/source/blender/compositor/nodes/COM_VectorCurveNode.cc index 1201a9f9613..f2fd80cd93e 100644 --- a/source/blender/compositor/nodes/COM_VectorCurveNode.cc +++ b/source/blender/compositor/nodes/COM_VectorCurveNode.cc @@ -20,6 +20,8 @@ #include "COM_ExecutionSystem.h" #include "COM_VectorCurveOperation.h" +namespace blender::compositor { + VectorCurveNode::VectorCurveNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -35,3 +37,5 @@ void VectorCurveNode::convertToOperations(NodeConverter &converter, converter.mapInputSocket(getInputSocket(0), operation->getInputSocket(0)); converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket()); } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_VectorCurveNode.h b/source/blender/compositor/nodes/COM_VectorCurveNode.h index 4d7f92897a1..ee4df5d3a42 100644 --- a/source/blender/compositor/nodes/COM_VectorCurveNode.h +++ b/source/blender/compositor/nodes/COM_VectorCurveNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief VectorCurveNode * \ingroup Node @@ -27,5 +29,8 @@ class VectorCurveNode : public Node { public: VectorCurveNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ViewLevelsNode.cc b/source/blender/compositor/nodes/COM_ViewLevelsNode.cc index 7b86fb1d64d..dc454b95080 100644 --- a/source/blender/compositor/nodes/COM_ViewLevelsNode.cc +++ b/source/blender/compositor/nodes/COM_ViewLevelsNode.cc @@ -22,6 +22,8 @@ #include "COM_ExecutionSystem.h" #include "COM_SetValueOperation.h" +namespace blender::compositor { + ViewLevelsNode::ViewLevelsNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -59,3 +61,5 @@ void ViewLevelsNode::convertToOperations(NodeConverter &converter, converter.addOutputValue(getOutputSocket(1), 0.0f); } } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ViewLevelsNode.h b/source/blender/compositor/nodes/COM_ViewLevelsNode.h index 0e931fed055..055d871498e 100644 --- a/source/blender/compositor/nodes/COM_ViewLevelsNode.h +++ b/source/blender/compositor/nodes/COM_ViewLevelsNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief ViewLevelsNode * \ingroup Node @@ -27,5 +29,8 @@ class ViewLevelsNode : public Node { public: ViewLevelsNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ViewerNode.cc b/source/blender/compositor/nodes/COM_ViewerNode.cc index 359c3d3031d..3833a8d7ca8 100644 --- a/source/blender/compositor/nodes/COM_ViewerNode.cc +++ b/source/blender/compositor/nodes/COM_ViewerNode.cc @@ -25,6 +25,8 @@ #include "COM_ExecutionSystem.h" #include "COM_ViewerOperation.h" +namespace blender::compositor { + ViewerNode::ViewerNode(bNode *editorNode) : Node(editorNode) { /* pass */ @@ -82,3 +84,5 @@ void ViewerNode::convertToOperations(NodeConverter &converter, converter.registerViewer(viewerOperation); } } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ViewerNode.h b/source/blender/compositor/nodes/COM_ViewerNode.h index 74758417014..544a5e6a504 100644 --- a/source/blender/compositor/nodes/COM_ViewerNode.h +++ b/source/blender/compositor/nodes/COM_ViewerNode.h @@ -20,6 +20,9 @@ #include "COM_Node.h" #include "DNA_node_types.h" + +namespace blender::compositor { + /** * \brief ViewerNode * \ingroup Node @@ -27,5 +30,8 @@ class ViewerNode : public Node { public: ViewerNode(bNode *editorNode); - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ZCombineNode.cc b/source/blender/compositor/nodes/COM_ZCombineNode.cc index b61c018d029..a76049ff249 100644 --- a/source/blender/compositor/nodes/COM_ZCombineNode.cc +++ b/source/blender/compositor/nodes/COM_ZCombineNode.cc @@ -28,6 +28,8 @@ #include "DNA_material_types.h" /* the ramp types */ +namespace blender::compositor { + void ZCombineNode::convertToOperations(NodeConverter &converter, const CompositorContext &context) const { @@ -99,3 +101,5 @@ void ZCombineNode::convertToOperations(NodeConverter &converter, converter.mapOutputSocket(getOutputSocket(1), zoperation->getOutputSocket()); } } + +} // namespace blender::compositor diff --git a/source/blender/compositor/nodes/COM_ZCombineNode.h b/source/blender/compositor/nodes/COM_ZCombineNode.h index ca54fd7fffa..82f2f30fb3c 100644 --- a/source/blender/compositor/nodes/COM_ZCombineNode.h +++ b/source/blender/compositor/nodes/COM_ZCombineNode.h @@ -20,6 +20,8 @@ #include "COM_Node.h" +namespace blender::compositor { + /** * \brief ZCombineNode * \ingroup Node @@ -29,5 +31,8 @@ class ZCombineNode : public Node { ZCombineNode(bNode *editorNode) : Node(editorNode) { } - void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; + void convertToOperations(NodeConverter &converter, + const CompositorContext &context) const override; }; + +} // namespace blender::compositor |