1 files changed, 47 insertions, 37 deletions

diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_randomize.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_randomize.cc
index 2901472d661..2501e3356ee 100644
--- a/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_randomize.cc
+++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_randomize.cc
@@ -23,7 +23,7 @@
 
 #include "node_geometry_util.hh"
 
-namespace blender::nodes {
+namespace blender::nodes::attribute_randomize_node {
 
 static void geo_node_legacy_attribute_randomize_declare(NodeDeclarationBuilder &b)
 {
@@ -174,36 +174,6 @@ static void randomize_attribute_bool(MutableSpan<bool> span,
   });
 }
 
-Array<uint32_t> get_geometry_element_ids_as_uints(const GeometryComponent &component,
-                                                  const AttributeDomain domain)
-{
-  const int domain_size = component.attribute_domain_size(domain);
-
-  /* Hash the reserved name attribute "id" as a (hopefully) stable seed for each point. */
-  GVArrayPtr hash_attribute = component.attribute_try_get_for_read("id", domain);
-  Array<uint32_t> hashes(domain_size);
-  if (hash_attribute) {
-    BLI_assert(hashes.size() == hash_attribute->size());
-    const CPPType &cpp_type = hash_attribute->type();
-    BLI_assert(cpp_type.is_hashable());
-    GVArray_GSpan items{*hash_attribute};
-    threading::parallel_for(hashes.index_range(), 512, [&](IndexRange range) {
-      for (const int i : range) {
-        hashes[i] = cpp_type.hash(items[i]);
-      }
-    });
-  }
-  else {
-    /* If there is no "id" attribute for per-point variation, just create it here. */
-    RandomNumberGenerator rng(0);
-    for (const int i : hashes.index_range()) {
-      hashes[i] = rng.get_uint32();
-    }
-  }
-
-  return hashes;
-}
-
 static AttributeDomain get_result_domain(const GeometryComponent &component,
                                          const GeoNodeExecParams &params,
                                          const StringRef name)
@@ -324,6 +294,40 @@ static void geo_node_legacy_random_attribute_exec(GeoNodeExecParams params)
   params.set_output("Geometry", geometry_set);
 }
 
+}  // namespace blender::nodes::attribute_randomize_node
+
+namespace blender::nodes {
+
+Array<uint32_t> get_geometry_element_ids_as_uints(const GeometryComponent &component,
+                                                  const AttributeDomain domain)
+{
+  const int domain_size = component.attribute_domain_size(domain);
+
+  /* Hash the reserved name attribute "id" as a (hopefully) stable seed for each point. */
+  GVArrayPtr hash_attribute = component.attribute_try_get_for_read("id", domain);
+  Array<uint32_t> hashes(domain_size);
+  if (hash_attribute) {
+    BLI_assert(hashes.size() == hash_attribute->size());
+    const CPPType &cpp_type = hash_attribute->type();
+    BLI_assert(cpp_type.is_hashable());
+    GVArray_GSpan items{*hash_attribute};
+    threading::parallel_for(hashes.index_range(), 512, [&](IndexRange range) {
+      for (const int i : range) {
+        hashes[i] = cpp_type.hash(items[i]);
+      }
+    });
+  }
+  else {
+    /* If there is no "id" attribute for per-point variation, just create it here. */
+    RandomNumberGenerator rng(0);
+    for (const int i : hashes.index_range()) {
+      hashes[i] = rng.get_uint32();
+    }
+  }
+
+  return hashes;
+}
+
 }  // namespace blender::nodes
 
 void register_node_type_geo_legacy_attribute_randomize()
@@ -332,12 +336,18 @@ void register_node_type_geo_legacy_attribute_randomize()
 
   geo_node_type_base(
       &ntype, GEO_NODE_LEGACY_ATTRIBUTE_RANDOMIZE, "Attribute Randomize", NODE_CLASS_ATTRIBUTE, 0);
-  node_type_init(&ntype, blender::nodes::geo_node_legacy_attribute_randomize_init);
-  node_type_update(&ntype, blender::nodes::geo_node_legacy_attribute_randomize_update);
-
-  ntype.declare = blender::nodes::geo_node_legacy_attribute_randomize_declare;
-  ntype.geometry_node_execute = blender::nodes::geo_node_legacy_random_attribute_exec;
-  ntype.draw_buttons = blender::nodes::geo_node_legacy_attribute_random_layout;
+  node_type_init(
+      &ntype, blender::nodes::attribute_randomize_node::geo_node_legacy_attribute_randomize_init);
+  node_type_update(
+      &ntype,
+      blender::nodes::attribute_randomize_node::geo_node_legacy_attribute_randomize_update);
+
+  ntype.declare =
+      blender::nodes::attribute_randomize_node::geo_node_legacy_attribute_randomize_declare;
+  ntype.geometry_node_execute =
+      blender::nodes::attribute_randomize_node::geo_node_legacy_random_attribute_exec;
+  ntype.draw_buttons =
+      blender::nodes::attribute_randomize_node::geo_node_legacy_attribute_random_layout;
   node_type_storage(
       &ntype, "NodeAttributeRandomize", node_free_standard_storage, node_copy_standard_storage);
   nodeRegisterType(&ntype);