diff options
Diffstat (limited to 'source/blender/blenkernel/intern/node_tree_ref.cc')
| -rw-r--r-- | source/blender/blenkernel/intern/node_tree_ref.cc | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/source/blender/blenkernel/intern/node_tree_ref.cc b/source/blender/blenkernel/intern/node_tree_ref.cc index 517c1b85aff..6bd3e2d2e5a 100644 --- a/source/blender/blenkernel/intern/node_tree_ref.cc +++ b/source/blender/blenkernel/intern/node_tree_ref.cc @@ -18,7 +18,8 @@ #include "BLI_dot_export.hh" -namespace BKE { +namespace blender { +namespace bke { NodeTreeRef::NodeTreeRef(bNodeTree *btree) : m_btree(btree) { @@ -78,7 +79,8 @@ NodeTreeRef::NodeTreeRef(bNodeTree *btree) : m_btree(btree) } for (NodeRef *node : m_nodes_by_id) { - m_nodes_by_idname.lookup_or_add_default(node->idname()).append(node); + const bNodeType *nodetype = node->m_bnode->typeinfo; + m_nodes_by_type.lookup_or_add_default(nodetype).append(node); } } @@ -138,15 +140,13 @@ void NodeTreeRef::find_targets_skipping_reroutes(OutputSocketRef &socket, std::string NodeTreeRef::to_dot() const { - namespace Dot = blender::DotExport; + dot::DirectedGraph digraph; + digraph.set_rankdir(dot::Attr_rankdir::LeftToRight); - Dot::DirectedGraph digraph; - digraph.set_rankdir(Dot::Attr_rankdir::LeftToRight); - - Map<const NodeRef *, Dot::NodeWithSocketsRef> dot_nodes; + Map<const NodeRef *, dot::NodeWithSocketsRef> dot_nodes; for (const NodeRef *node : m_nodes_by_id) { - Dot::Node &dot_node = digraph.new_node(""); + dot::Node &dot_node = digraph.new_node(""); dot_node.set_background_color("white"); Vector<std::string> input_names; @@ -159,13 +159,13 @@ std::string NodeTreeRef::to_dot() const } dot_nodes.add_new(node, - Dot::NodeWithSocketsRef(dot_node, node->name(), input_names, output_names)); + dot::NodeWithSocketsRef(dot_node, node->name(), input_names, output_names)); } for (const OutputSocketRef *from_socket : m_output_sockets) { for (const InputSocketRef *to_socket : from_socket->directly_linked_sockets()) { - Dot::NodeWithSocketsRef &from_dot_node = dot_nodes.lookup(&from_socket->node()); - Dot::NodeWithSocketsRef &to_dot_node = dot_nodes.lookup(&to_socket->node()); + dot::NodeWithSocketsRef &from_dot_node = dot_nodes.lookup(&from_socket->node()); + dot::NodeWithSocketsRef &to_dot_node = dot_nodes.lookup(&to_socket->node()); digraph.new_edge(from_dot_node.output(from_socket->index()), to_dot_node.input(to_socket->index())); @@ -175,4 +175,5 @@ std::string NodeTreeRef::to_dot() const return digraph.to_dot_string(); } -} // namespace BKE +} // namespace bke +} // namespace blender |