diff options
| author | Jacques Lucke <mail@jlucke.com> | 2020-02-10 16:46:44 +0300 |
|---|---|---|
| committer | Jacques Lucke <mail@jlucke.com> | 2020-02-10 16:46:44 +0300 |
| commit | 2d368366166f1be74920e99b4e771df243b852df (patch) | |
| tree | e30d4585be02002240462283102dc8d839f474d6 /source/blender/functions | |
| parent | 0b9888d0383709880d2c0e6343266668c1dd7af1 (diff) | |
cleanup dot export
Diffstat (limited to 'source/blender/functions')
| -rw-r--r-- | source/blender/functions/intern/multi_function_network.cc | 7 | ||||
| -rw-r--r-- | source/blender/functions/intern/node_tree.cc | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/source/blender/functions/intern/multi_function_network.cc b/source/blender/functions/intern/multi_function_network.cc index fdf51afd062..ef22f435a66 100644 --- a/source/blender/functions/intern/multi_function_network.cc +++ b/source/blender/functions/intern/multi_function_network.cc @@ -318,11 +318,11 @@ Vector<MFBuilderNode *> MFNetworkBuilder::find_nodes_not_to_the_left_of__exclusi std::string MFNetworkBuilder::to_dot(const Set<MFBuilderNode *> &marked_nodes) { - using BLI::DotExport::Utils::NodeWithSocketsWrapper; + using BLI::DotExport::NodeWithSocketsRef; BLI::DotExport::DirectedGraph digraph; digraph.set_rankdir(BLI::DotExport::Attr_rankdir::LeftToRight); - Map<MFBuilderNode *, NodeWithSocketsWrapper> dot_nodes; + Map<MFBuilderNode *, NodeWithSocketsRef> dot_nodes; Vector<MFBuilderNode *> all_nodes; all_nodes.extend(m_function_nodes.as_ref()); @@ -347,8 +347,7 @@ std::string MFNetworkBuilder::to_dot(const Set<MFBuilderNode *> &marked_nodes) dot_node.set_background_color("#99EE99"); } - dot_nodes.add_new(node, - NodeWithSocketsWrapper(dot_node, node->name(), input_names, output_names)); + dot_nodes.add_new(node, NodeWithSocketsRef(dot_node, node->name(), input_names, output_names)); } for (MFBuilderNode *to_node : all_nodes) { diff --git a/source/blender/functions/intern/node_tree.cc b/source/blender/functions/intern/node_tree.cc index 18f8f53c56e..d84acb5ad8a 100644 --- a/source/blender/functions/intern/node_tree.cc +++ b/source/blender/functions/intern/node_tree.cc @@ -388,8 +388,8 @@ std::string FunctionTree::to_dot() const BLI::DotExport::DirectedGraph digraph; digraph.set_rankdir(BLI::DotExport::Attr_rankdir::LeftToRight); - Map<const FNode *, BLI::DotExport::Utils::NodeWithSocketsWrapper> dot_nodes; - Map<const FGroupInput *, BLI::DotExport::Utils::NodeWithSocketsWrapper> dot_group_inputs; + Map<const FNode *, BLI::DotExport::NodeWithSocketsRef> dot_nodes; + Map<const FGroupInput *, BLI::DotExport::NodeWithSocketsRef> dot_group_inputs; Map<const FParentNode *, BLI::DotExport::Cluster *> dot_clusters; for (const FNode *fnode : m_node_by_id) { @@ -407,7 +407,7 @@ std::string FunctionTree::to_dot() const } dot_nodes.add_new(fnode, - BLI::DotExport::Utils::NodeWithSocketsWrapper( + BLI::DotExport::NodeWithSocketsRef( dot_node, fnode->vnode().name(), input_names, output_names)); BLI::DotExport::Cluster *cluster = get_cluster_for_parent( @@ -425,7 +425,7 @@ std::string FunctionTree::to_dot() const dot_group_inputs.add_new( group_input, - BLI::DotExport::Utils::NodeWithSocketsWrapper( + BLI::DotExport::NodeWithSocketsRef( dot_group_input_node, "Group Input", {}, {group_input_name})); BLI::DotExport::Cluster *cluster = get_cluster_for_parent( |