diff options
author | Jeroen Bakker <jeroen@blender.org> | 2021-04-02 17:13:27 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2021-04-02 17:13:27 +0300 |
commit | 36427a8d03673a8604d3ec4b30be709e86fe6312 (patch) | |
tree | ea882d553c73accbbbf748e6988ed452c1ae0669 /source/blender/compositor/nodes | |
parent | b6ab1107c20228d441a6d992eb11c639ed2ce1d0 (diff) |
Cleanup: remove loading blender namespace from Vector.
Diffstat (limited to 'source/blender/compositor/nodes')
-rw-r--r-- | source/blender/compositor/nodes/COM_CryptomatteNode.cc | 12 | ||||
-rw-r--r-- | source/blender/compositor/nodes/COM_CryptomatteNode.h | 18 |
2 files changed, 14 insertions, 16 deletions
diff --git a/source/blender/compositor/nodes/COM_CryptomatteNode.cc b/source/blender/compositor/nodes/COM_CryptomatteNode.cc index 23305fa06f8..d97e4371dc6 100644 --- a/source/blender/compositor/nodes/COM_CryptomatteNode.cc +++ b/source/blender/compositor/nodes/COM_CryptomatteNode.cc @@ -103,7 +103,7 @@ static std::string combined_layer_pass_name(RenderLayer *render_layer, RenderPas void CryptomatteNode::input_operations_from_render_source( const CompositorContext &context, const bNode &node, - blender::Vector<NodeOperation *> &r_input_operations) + Vector<NodeOperation *> &r_input_operations) { Scene *scene = (Scene *)node.id; if (!scene) { @@ -143,7 +143,7 @@ void CryptomatteNode::input_operations_from_render_source( void CryptomatteNode::input_operations_from_image_source( const CompositorContext &context, const bNode &node, - blender::Vector<NodeOperation *> &r_input_operations) + Vector<NodeOperation *> &r_input_operations) { NodeCryptomatte *cryptomatte_settings = (NodeCryptomatte *)node.storage; Image *image = (Image *)node.id; @@ -202,10 +202,10 @@ void CryptomatteNode::input_operations_from_image_source( BKE_image_release_ibuf(image, ibuf, nullptr); } -blender::Vector<NodeOperation *> CryptomatteNode::create_input_operations( - const CompositorContext &context, const bNode &node) +Vector<NodeOperation *> CryptomatteNode::create_input_operations(const CompositorContext &context, + const bNode &node) { - blender::Vector<NodeOperation *> input_operations; + Vector<NodeOperation *> input_operations; switch (node.custom1) { case CMP_CRYPTOMATTE_SRC_RENDER: input_operations_from_render_source(context, node, input_operations); @@ -231,7 +231,7 @@ CryptomatteOperation *CryptomatteNode::create_cryptomatte_operation( const bNode &node, const NodeCryptomatte *cryptomatte_settings) const { - blender::Vector<NodeOperation *> input_operations = create_input_operations(context, node); + Vector<NodeOperation *> input_operations = create_input_operations(context, node); CryptomatteOperation *operation = new CryptomatteOperation(input_operations.size()); LISTBASE_FOREACH (CryptomatteEntry *, cryptomatte_entry, &cryptomatte_settings->entries) { operation->addObjectIndex(cryptomatte_entry->encoded_hash); diff --git a/source/blender/compositor/nodes/COM_CryptomatteNode.h b/source/blender/compositor/nodes/COM_CryptomatteNode.h index a6ba860c678..eacb49e2033 100644 --- a/source/blender/compositor/nodes/COM_CryptomatteNode.h +++ b/source/blender/compositor/nodes/COM_CryptomatteNode.h @@ -64,16 +64,14 @@ class CryptomatteNode : public CryptomatteBaseNode { const NodeCryptomatte *cryptomatte_settings) const override; private: - static blender::Vector<NodeOperation *> create_input_operations(const CompositorContext &context, - const bNode &node); - static void input_operations_from_render_source( - const CompositorContext &context, - const bNode &node, - blender::Vector<NodeOperation *> &r_input_operations); - static void input_operations_from_image_source( - const CompositorContext &context, - const bNode &node, - blender::Vector<NodeOperation *> &r_input_operations); + static Vector<NodeOperation *> create_input_operations(const CompositorContext &context, + const bNode &node); + static void input_operations_from_render_source(const CompositorContext &context, + const bNode &node, + Vector<NodeOperation *> &r_input_operations); + static void input_operations_from_image_source(const CompositorContext &context, + const bNode &node, + Vector<NodeOperation *> &r_input_operations); }; class CryptomatteLegacyNode : public CryptomatteBaseNode { |