[Bf-blender-cvs] [0d15b30eb1a] temp-derived-node-tree-refactor: simplify importing types

[Jacques Lucke]

Commit: 0d15b30eb1abb9a8b7d646f65cfc6b8f5afcc0b7
Author: Jacques Lucke
Date:   Wed Mar 3 09:31:16 2021 +0100
Branches: temp-derived-node-tree-refactor
https://developer.blender.org/rB0d15b30eb1abb9a8b7d646f65cfc6b8f5afcc0b7

simplify importing types

===================================================================

M	source/blender/modifiers/intern/MOD_nodes.cc
M	source/blender/nodes/NOD_XXX_node_tree.hh
M	source/blender/nodes/NOD_node_tree_ref.hh

===================================================================

diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc
index b47f5806c9c..8ac2607f17c 100644
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@ -70,6 +70,7 @@
 #include "MOD_nodes.h"
 #include "MOD_ui_common.h"
 
+#include "NOD_XXX_node_tree.hh"
 #include "NOD_derived_node_tree.hh"
 #include "NOD_geometry.h"
 #include "NOD_geometry_exec.hh"
@@ -92,6 +93,7 @@ using blender::fn::GValueMap;
 using blender::nodes::GeoNodeExecParams;
 using namespace blender::nodes::derived_node_tree_types;
 using namespace blender::fn::multi_function_types;
+using namespace blender::nodes::xxx_node_tree_types;
 
 static void initData(ModifierData *md)
 {
@@ -1126,8 +1128,9 @@ static void modifyGeometry(ModifierData *md,
 
   check_property_socket_sync(ctx->object, md);
 
-  blender::nodes::NodeTreeRefMap tree_refs;
+  NodeTreeRefMap tree_refs;
   DerivedNodeTree tree{nmd->node_group, tree_refs};
+  XXXNodeTree xxx_tree{*nmd->node_group, tree_refs};
 
   if (tree.has_link_cycles()) {
     BKE_modifier_set_error(ctx->object, md, "Node group has cycles");
diff --git a/source/blender/nodes/NOD_XXX_node_tree.hh b/source/blender/nodes/NOD_XXX_node_tree.hh
index a0b68796d0a..bce29ab33c6 100644
--- a/source/blender/nodes/NOD_XXX_node_tree.hh
+++ b/source/blender/nodes/NOD_XXX_node_tree.hh
@@ -144,6 +144,7 @@ class XXXNodeTree {
 };
 
 namespace xxx_node_tree_types {
+using namespace node_tree_ref_types;
 using nodes::XXXInputSocket;
 using nodes::XXXNode;
 using nodes::XXXNodeTree;
diff --git a/source/blender/nodes/NOD_node_tree_ref.hh b/source/blender/nodes/NOD_node_tree_ref.hh
index 94a2daf9ffa..18886ea952b 100644
--- a/source/blender/nodes/NOD_node_tree_ref.hh
+++ b/source/blender/nodes/NOD_node_tree_ref.hh
@@ -221,6 +221,15 @@ using NodeTreeRefMap = Map<bNodeTree *, std::unique_ptr<const NodeTreeRef>>;
 
 const NodeTreeRef &get_tree_ref_from_map(NodeTreeRefMap &node_tree_refs, bNodeTree &btree);
 
+namespace node_tree_ref_types {
+using nodes::InputSocketRef;
+using nodes::NodeRef;
+using nodes::NodeTreeRef;
+using nodes::NodeTreeRefMap;
+using nodes::OutputSocketRef;
+using nodes::SocketRef;
+}  // namespace node_tree_ref_types
+
 /* --------------------------------------------------------------------
  * SocketRef inline methods.
  */