source/blender/geometry/GEO_join_geometries.hh

@@ -13,6 +13,6 @@ bke::GeometrySet join_geometries(Span<bke::GeometrySet> geometries,
                                  const bke::AnonymousAttributePropagationInfo &propagation_info);
 
 void join_attributes(Span<const bke::GeometryComponent *> src_components,
-                     bke::GeometryComponent &r_result,
+                     Span<StringRef> ignored_attributes,
-                     Span<StringRef> ignored_attributes = {});
+                     bke::GeometryComponent &r_result);
 }  // namespace blender::geometry

source/blender/geometry/GEO_realize_instances.hh

@@ -62,16 +62,8 @@ bke::GeometrySet realize_instances(bke::GeometrySet geometry_set,
                                    const RealizeInstancesOptions &options);
 
 /**
- * Join all instances into a single geometry component for each geometry type. For example, all
+ * Same #realize_instances but will realize only the instances chosen by
- * mesh instances (including the already realized mesh) are joined into a single mesh. The output
+ * varied_depth_option to there chosen depth.
- * geometry set does not contain any instances. If the input did not contain any instances, it is
- * returned directly.
- *
- * The `id` attribute has special handling. If there is an id attribute on any component, the
- * output will contain an `id` attribute as well. The output id is generated by mixing/hashing ids
- * of instances and of the instanced geometry data.
- *
- * Will realize only the instances chosen by varied_depth_option to there chosen depth.
  */
 bke::GeometrySet realize_instances(bke::GeometrySet geometry_set,
                                    const RealizeInstancesOptions &options,

source/blender/geometry/intern/join_geometries.cc

@@ -74,8 +74,8 @@ static void fill_new_attribute(const Span<const GeometryComponent *> src_compone
 }
 
 void join_attributes(const Span<const GeometryComponent *> src_components,
-                     GeometryComponent &r_result,
+                     const Span<StringRef> ignored_attributes,
-                     const Span<StringRef> ignored_attributes)
+                     GeometryComponent &r_result)
 {
   const Map<AttributeIDRef, AttributeMetaData> info = get_final_attribute_info(src_components,
                                                                                ignored_attributes);
@@ -129,7 +129,7 @@ static void join_instances(const Span<const GeometryComponent *> src_components,
 
   r_result.replace_instances(dst_instances.release());
   auto &dst_component = r_result.get_component_for_write<bke::InstancesComponent>();
-  join_attributes(src_components, dst_component, {".reference_index"});
+  join_attributes(src_components, {".reference_index"}, dst_component);
 }
 
 static void join_volumes(const Span<const GeometryComponent *> /*src_components*/,

source/blender/geometry/intern/realize_instances.cc

@@ -298,7 +298,7 @@ struct InstanceContext {
         curves(gather_info.curves.attributes.size()),
         instances(gather_info.instances_attriubutes.size())
   {
-    //empty
+    // empty
   }
 };
 
@@ -823,12 +823,11 @@ static bool attribute_foreach(const bke::GeometrySet &geometry_set,
   return is_relevant;
 }
 
-
 /**
  * Based on bke::GeometrySet::gather_attributes_for_propagation.
  * Specialized for Specialized attribute_foreach to get:
  * current_depth, depth_target, instance_depth and selection.
-*/
+ */
 void static gather_attributes_for_propagation(
     bke::GeometrySet re_geometry_set,
     const Span<bke::GeometryComponent::Type> component_types,
@@ -869,7 +868,8 @@ void static gather_attributes_for_propagation(
 
                       AttrDomain domain = meta_data.domain;
                       if (dst_component_type != bke::GeometryComponent::Type::Instance &&
-                          domain == AttrDomain::Instance) {
+                          domain == AttrDomain::Instance)
+                      {
                         domain = AttrDomain::Point;
                       }
 
@@ -1014,7 +1014,7 @@ static void execute_instances_tasks(
   }
 
   join_attributes(
-      for_join_attributes, dst_component, {"position", ".reference_index", "instance_transform"});
+      for_join_attributes, {"position", ".reference_index", "instance_transform"}, dst_component);
 }
 
 /** \} */
@@ -1990,9 +1990,7 @@ bke::GeometrySet realize_instances(bke::GeometrySet geometry_set,
   VariedDepthOption all_instances;
   all_instances.depths = VArray<int>::ForSingle(VariedDepthOption::MAX_DEPTH,
                                                 geometry_set.get_instances()->instances_num());
-  IndexMaskMemory memory;
+  all_instances.selection = IndexMask(geometry_set.get_instances()->instances_num());
-  all_instances.selection = IndexMask::from_bools(
-      VArray<bool>::ForSingle(true, geometry_set.get_instances()->instances_num()), memory);
   return realize_instances(geometry_set, options, all_instances);
 }
 
@@ -2049,12 +2047,8 @@ bke::GeometrySet realize_instances(bke::GeometrySet geometry_set,
   const float4x4 transform = float4x4::identity();
   InstanceContext attribute_fallbacks(gather_info);
 
-  gather_realize_tasks_recursive(gather_info,
+  gather_realize_tasks_recursive(
-                                 0,
+      gather_info, 0, VariedDepthOption::MAX_DEPTH, geometry_set, transform, attribute_fallbacks);
-                                 VariedDepthOption::MAX_DEPTH,
-                                 geometry_set,
-                                 transform,
-                                 attribute_fallbacks);
 
   bke::GeometrySet new_geometry_set;
   execute_instances_tasks(gather_info.instances.instances_components_to_merge,
@@ -2068,22 +2062,22 @@ bke::GeometrySet realize_instances(bke::GeometrySet geometry_set,
    * multi-threading (overhead). */
   const int64_t approximate_used_bytes_num = total_points_num * 32;
   threading::memory_bandwidth_bound_task(approximate_used_bytes_num, [&]() {
-  execute_realize_pointcloud_tasks(options.keep_original_ids,
+    execute_realize_pointcloud_tasks(options.keep_original_ids,
-                                   all_pointclouds_info,
+                                     all_pointclouds_info,
-                                   gather_info.r_tasks.pointcloud_tasks,
+                                     gather_info.r_tasks.pointcloud_tasks,
-                                   all_pointclouds_info.attributes,
+                                     all_pointclouds_info.attributes,
-                                   new_geometry_set);
+                                     new_geometry_set);
-  execute_realize_mesh_tasks(options.keep_original_ids,
+    execute_realize_mesh_tasks(options.keep_original_ids,
-                             all_meshes_info,
+                               all_meshes_info,
-                             gather_info.r_tasks.mesh_tasks,
+                               gather_info.r_tasks.mesh_tasks,
-                             all_meshes_info.attributes,
+                               all_meshes_info.attributes,
-                             all_meshes_info.materials,
+                               all_meshes_info.materials,
-                             new_geometry_set);
+                               new_geometry_set);
-  execute_realize_curve_tasks(options.keep_original_ids,
+    execute_realize_curve_tasks(options.keep_original_ids,
-                              all_curves_info,
+                                all_curves_info,
-                              gather_info.r_tasks.curve_tasks,
+                                gather_info.r_tasks.curve_tasks,
-                              all_curves_info.attributes,
+                                all_curves_info.attributes,
-                              new_geometry_set);
+                                new_geometry_set);
   });
   if (gather_info.r_tasks.first_volume) {
     new_geometry_set.add(*gather_info.r_tasks.first_volume);

source/blender/nodes/geometry/nodes/node_geo_realize_instances.cc

@@ -18,13 +18,13 @@ static void node_declare(NodeDeclarationBuilder &b)
   b.add_input<decl::Bool>("Selection")
       .default_value(true)
       .hide_value()
-      .supports_field()
+      .field_on_all()
       .description("Which top-level instances to realize");
   b.add_input<decl::Bool>("Realize All")
       .default_value(true)
-      .supports_field()
+      .field_on_all()
       .description("Determine wether to realize nested instances completly");
-  b.add_input<decl::Int>("Depth").default_value(0).min(0).supports_field().description(
+  b.add_input<decl::Int>("Depth").default_value(0).min(0).field_on_all().description(
       "Number of levels of nested instances to realize for each top-level instance");
   b.add_output<decl::Geometry>("Geometry").propagate_all();
 }
@@ -44,7 +44,9 @@ static void node_geo_exec(GeoNodeExecParams params)
 
   static auto depth_override = mf::build::SI2_SO<int, bool, int>(
       "depth_override",
-      [](int value, bool realize) { return realize ? -1 : std::max(value, 0); },
+      [](int value, bool realize_all_filed) {
+        return realize_all_filed ? geometry::VariedDepthOption::MAX_DEPTH : std::max(value, 0);
+      },
       mf::build::exec_presets::AllSpanOrSingle());
 
   static auto selection_override = mf::build::SI2_SO<int, bool, bool>(