1 files changed, 19 insertions, 17 deletions

diff --git a/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc b/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc
index 503711fedfe..6b8c895879d 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc
@@ -27,9 +27,11 @@
 
 #include <algorithm>
 
-namespace blender::nodes {
+namespace blender::nodes::node_geo_collection_info_cc {
 
-static void geo_node_collection_info_declare(NodeDeclarationBuilder &b)
+NODE_STORAGE_FUNCS(NodeGeometryCollectionInfo)
+
+static void node_declare(NodeDeclarationBuilder &b)
 {
   b.add_input<decl::Collection>(N_("Collection")).hide_label();
   b.add_input<decl::Bool>(N_("Separate Children"))
@@ -42,12 +44,12 @@ static void geo_node_collection_info_declare(NodeDeclarationBuilder &b)
   b.add_output<decl::Geometry>(N_("Geometry"));
 }
 
-static void geo_node_collection_info_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
+static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
   uiItemR(layout, ptr, "transform_space", UI_ITEM_R_EXPAND, nullptr, ICON_NONE);
 }
 
-static void geo_node_collection_info_node_init(bNodeTree *UNUSED(tree), bNode *node)
+static void node_node_init(bNodeTree *UNUSED(tree), bNode *node)
 {
   NodeGeometryCollectionInfo *data = (NodeGeometryCollectionInfo *)MEM_callocN(
       sizeof(NodeGeometryCollectionInfo), __func__);
@@ -61,14 +63,12 @@ struct InstanceListEntry {
   float4x4 transform;
 };
 
-static void geo_node_collection_info_exec(GeoNodeExecParams params)
+static void node_geo_exec(GeoNodeExecParams params)
 {
   Collection *collection = params.get_input<Collection *>("Collection");
 
-  GeometrySet geometry_set_out;
-
   if (collection == nullptr) {
-    params.set_output("Geometry", geometry_set_out);
+    params.set_default_remaining_outputs();
     return;
   }
   const Object *self_object = params.self_object();
@@ -76,15 +76,15 @@ static void geo_node_collection_info_exec(GeoNodeExecParams params)
                                                                           (Object *)self_object);
   if (is_recursive) {
     params.error_message_add(NodeWarningType::Error, "Collection contains current object");
-    params.set_output("Geometry", geometry_set_out);
+    params.set_default_remaining_outputs();
     return;
   }
 
-  const bNode &bnode = params.node();
-  NodeGeometryCollectionInfo *node_storage = (NodeGeometryCollectionInfo *)bnode.storage;
-  const bool use_relative_transform = (node_storage->transform_space ==
+  const NodeGeometryCollectionInfo &storage = node_storage(params.node());
+  const bool use_relative_transform = (storage.transform_space ==
                                        GEO_NODE_TRANSFORM_SPACE_RELATIVE);
 
+  GeometrySet geometry_set_out;
   InstancesComponent &instances = geometry_set_out.get_component_for_write<InstancesComponent>();
 
   const bool separate_children = params.get_input<bool>("Separate Children");
@@ -155,20 +155,22 @@ static void geo_node_collection_info_exec(GeoNodeExecParams params)
   params.set_output("Geometry", geometry_set_out);
 }
 
-}  // namespace blender::nodes
+}  // namespace blender::nodes::node_geo_collection_info_cc
 
 void register_node_type_geo_collection_info()
 {
+  namespace file_ns = blender::nodes::node_geo_collection_info_cc;
+
   static bNodeType ntype;
 
   geo_node_type_base(&ntype, GEO_NODE_COLLECTION_INFO, "Collection Info", NODE_CLASS_INPUT, 0);
-  ntype.declare = blender::nodes::geo_node_collection_info_declare;
-  node_type_init(&ntype, blender::nodes::geo_node_collection_info_node_init);
+  ntype.declare = file_ns::node_declare;
+  node_type_init(&ntype, file_ns::node_node_init);
   node_type_storage(&ntype,
                     "NodeGeometryCollectionInfo",
                     node_free_standard_storage,
                     node_copy_standard_storage);
-  ntype.geometry_node_execute = blender::nodes::geo_node_collection_info_exec;
-  ntype.draw_buttons = blender::nodes::geo_node_collection_info_layout;
+  ntype.geometry_node_execute = file_ns::node_geo_exec;
+  ntype.draw_buttons = file_ns::node_layout;
   nodeRegisterType(&ntype);
 }