diff options
author | Jacques Lucke <jacques@blender.org> | 2021-06-14 13:44:13 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2021-06-14 13:44:13 +0300 |
commit | dddcf1e9bbf4a6d1f4ff03eaf0cb7e9228b18ec5 (patch) | |
tree | c20defa7efd54c933d20a296abefe567909bb6c0 /source/blender/compositor/nodes/COM_MixNode.cc | |
parent | 3b162b7c185d089e93d892169a458d552196b7b6 (diff) | |
parent | c9dc55301cd7903b7ef7c045d337ada29aa809a1 (diff) |
Merge branch 'master' into temp-compact-node-prototypetemp-compact-node-prototype
Diffstat (limited to 'source/blender/compositor/nodes/COM_MixNode.cc')
-rw-r--r-- | source/blender/compositor/nodes/COM_MixNode.cc | 4 |
1 files changed, 4 insertions, 0 deletions
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 |