diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-05-29 12:00:21 +0400 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2014-05-29 12:00:21 +0400 |
commit | 34ca8fe82a3a5fbd339d2292f2cc3599673a0c23 (patch) | |
tree | b696e2c4065f70a36fcb09c9a42e2e4e7f0d802c /source/blender/compositor/intern/COM_NodeGraph.h | |
parent | 47bf77951a69d1b817f5201525e62e9e496f1359 (diff) |
Fix T40414: Multiple input nodes in a group not working.
A node group can have multiple input nodes. In the compositor that means
each of the input sockets has to be connected to the linked outputs,
which is represented by a single link on the outside of the group.
Diffstat (limited to 'source/blender/compositor/intern/COM_NodeGraph.h')
-rw-r--r-- | source/blender/compositor/intern/COM_NodeGraph.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/compositor/intern/COM_NodeGraph.h b/source/blender/compositor/intern/COM_NodeGraph.h index 81799d76e1d..67f94bf3465 100644 --- a/source/blender/compositor/intern/COM_NodeGraph.h +++ b/source/blender/compositor/intern/COM_NodeGraph.h @@ -78,6 +78,7 @@ public: protected: typedef std::pair<NodeIterator, NodeIterator> NodeRange; + typedef std::vector<NodeInput *> NodeInputs; static bNodeSocket *find_b_node_input(bNode *b_node, const char *identifier); static bNodeSocket *find_b_node_output(bNode *b_node, const char *identifier); @@ -89,7 +90,7 @@ protected: void add_bNode(const CompositorContext &context, bNodeTree *b_ntree, bNode *b_node, bNodeInstanceKey key, bool is_active_group); - NodeInput *find_input(const NodeRange &node_range, bNodeSocket *b_socket); + NodeInputs find_inputs(const NodeRange &node_range, bNodeSocket *b_socket); NodeOutput *find_output(const NodeRange &node_range, bNodeSocket *b_socket); void add_bNodeLink(const NodeRange &node_range, bNodeLink *bNodeLink); |