source/blender/blenkernel/intern/geometry_set.cc

@@ -9,8 +9,8 @@
 #include "BLT_translation.h"
 
 #include "BKE_attribute.hh"
-#include "BKE_curves.hh"
 #include "BKE_collection.h"
+#include "BKE_curves.hh"
 #include "BKE_geometry_set.hh"
 #include "BKE_geometry_set_instances.hh"
 #include "BKE_grease_pencil.hh"
@@ -606,17 +606,26 @@ bool GeometrySet::attribute_foreach(const Span<GeometryComponent::Type> componen
     // ensure objects and collection are included.
     Instances ensure_instances = instances;
     ensure_instances.ensure_geometry_instances();
-    const IndexMask indices = (current_depth == 0) ? selection : IndexMask(IndexRange(ensure_instances.instances_num()));
+    const IndexMask indices = (current_depth == 0) ?
+                                  selection :
+                                  IndexMask(IndexRange(ensure_instances.instances_num()));
     for (const int index : indices.index_range()) {
       const int i = indices[index];
       const int depth_target_tmp = (current_depth == 0) ? instance_depth[i] : depth_target;
-      bke::InstanceReference reference = ensure_instances.references()[ensure_instances.reference_handles()[i]];
+      bke::InstanceReference reference =
+          ensure_instances.references()[ensure_instances.reference_handles()[i]];
 
       // Process child instances with a recursive call.
       if (reference.type() == InstanceReference::Type::GeometrySet) {
         bke::GeometrySet instance_geometry_set = reference.geometry_set();
         if (current_depth != depth_target_tmp) {
-          is_child_has_component = instance_geometry_set.attribute_foreach(component_types, include_instances, current_depth + 1, depth_target_tmp, instance_depth, selection, callback);
+          is_child_has_component = instance_geometry_set.attribute_foreach(component_types,
+                                                                           include_instances,
+                                                                           current_depth + 1,
+                                                                           depth_target_tmp,
+                                                                           instance_depth,
+                                                                           selection,
+                                                                           callback);
         }
       }
     }
@@ -633,7 +642,8 @@ bool GeometrySet::attribute_foreach(const Span<GeometryComponent::Type> componen
     }
 
     // Check for a special instance condition.
-    const bool is_special_instance = (component_type == GeometryComponent::Type::Instance) && (component_types.size() > 1);
+    const bool is_special_instance = (component_type == GeometryComponent::Type::Instance) &&
+                                     (component_types.size() > 1);
     if (is_special_instance && !is_child_has_component) {
       continue;
     }

source/blender/geometry/GEO_join_geometries.hh

@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #pragma once
-#include "BLI_math_matrix_types.hh"
 #include "BKE_anonymous_attribute_id.hh"
 #include "BKE_geometry_set.hh"
+#include "BLI_math_matrix_types.hh"
 
 namespace blender::geometry {
 
@@ -15,4 +15,4 @@ bke::GeometrySet join_geometries(Span<bke::GeometrySet> geometries,
 void join_attributes(const Span<const bke::GeometryComponent *> src_components,
                      bke::GeometryComponent &result,
                      const Span<StringRef> ignored_attributes);
-}
+}  // namespace blender::geometry

source/blender/geometry/GEO_realize_instances.hh

@@ -32,7 +32,6 @@ struct RealizeInstancesOptions {
    */
   VArray<int> depths;
 
-
   bke::AnonymousAttributePropagationInfo propagation_info;
 };
 

source/blender/geometry/intern/join_geometries.cc

@@ -187,7 +187,8 @@ static void join_component_type(const bke::GeometryComponent::Type component_typ
   options.propagation_info = propagation_info;
   options.depths = VArray<int>::ForSingle(99, instances.get()->instances_num());
   IndexMaskMemory memory;
-  options.selection = IndexMask::from_bools(VArray<bool>::ForSingle(true, instances.get()->instances_num()), memory);
+  options.selection = IndexMask::from_bools(
+      VArray<bool>::ForSingle(true, instances.get()->instances_num()), memory);
   GeometrySet joined_components = realize_instances(
       GeometrySet::from_instances(instances.release()), options);
   result.add(joined_components.get_component_for_write(component_type));

source/blender/geometry/intern/realize_instances.cc

@@ -2,9 +2,9 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include "BKE_geometry_set.hh"
 #include "GEO_join_geometries.hh"
 #include "GEO_realize_instances.hh"
-#include "BKE_geometry_set.hh"
 
 #include "DNA_collection_types.h"
 #include "DNA_layer_types.h"
@@ -281,7 +281,6 @@ struct GatherTasksInfo {
    */
   Vector<std::unique_ptr<GArray<>>> &r_temporary_arrays;
 
-
   AllInstancesInfo instances;
 
   /** All gathered tasks. */
@@ -314,7 +313,8 @@ struct InstanceContext {
   }
 };
 
-static void realize_collections(Collection *collection, bke::Instances* instances){
+static void realize_collections(Collection *collection, bke::Instances *instances)
+{
   Vector<Collection *> children_collections;
   LISTBASE_FOREACH (CollectionChild *, collection_child, &collection->children) {
     children_collections.append(collection_child->collection);
@@ -529,7 +529,8 @@ static void foreach_geometry_in_reference(
       Collection *collection_ptr = &reference.collection();
       std::unique_ptr<bke::Instances> instances = std::make_unique<bke::Instances>();
       realize_collections(collection_ptr, instances.get());
-      const bke::GeometrySet colleciton_geometry = bke::GeometrySet::from_instances(instances.release());
+      const bke::GeometrySet colleciton_geometry = bke::GeometrySet::from_instances(
+          instances.release());
       /* important as otherwise the Instances pointer would be deleted with the GeomtrySet*/
       colleciton_geometry.get_component(bke::GeometryComponent::Type::Instance)->add_user();
       fn(colleciton_geometry, base_transform, id);
@@ -576,9 +577,9 @@ static void gather_realize_tasks_for_instances(GatherTasksInfo &gather_info,
   Vector<std::pair<int, GSpan>> instance_attributes_to_override = prepare_attribute_fallbacks(
       gather_info, instances, gather_info.instances_attriubutes);
 
-
   /* If at top level, get instance indices from selection field, else use all instances. */
-  const IndexMask indices = current_depth == 0 ? gather_info.selection :IndexMask(IndexRange(instances.instances_num()));
+  const IndexMask indices = current_depth == 0 ? gather_info.selection :
+                                                 IndexMask(IndexRange(instances.instances_num()));
   for (const int mask_index : indices.index_range()) {
     const int i = indices[mask_index];
 
@@ -704,7 +705,8 @@ static void gather_realize_tasks_recursive(GatherTasksInfo &gather_info,
           gather_info.instances.instances_components_transforms.append(base_transform);
         }
         else {
-          const auto &instances_component = *static_cast<const bke::InstancesComponent *>(component);
+          const auto &instances_component = *static_cast<const bke::InstancesComponent *>(
+              component);
           const Instances *instances = instances_component.get();
           if (instances != nullptr && instances->instances_num() > 0) {
             gather_realize_tasks_for_instances(gather_info,
@@ -901,13 +903,15 @@ static void execute_realize_pointcloud_task(
       },
       dst_attribute_writers);
 }
-static void execute_instances_tasks(const Span<const bke::GeometryComponent *> src_components,
+static void execute_instances_tasks(
+    const Span<const bke::GeometryComponent *> src_components,
     Span<blender::float4x4> src_base_transforms,
     OrderedAttributes all_instances_attributes,
     Span<blender::geometry::AttributeFallbacksArray> attribute_fallback,
     bke::GeometrySet &result)
 {
-  BLI_assert(src_components.size() == src_base_transforms.size() && src_components.size() == attribute_fallback.size());
+  BLI_assert(src_components.size() == src_base_transforms.size() &&
+             src_components.size() == attribute_fallback.size());
   if (src_components.is_empty()) {
     return;
   }
@@ -915,7 +919,8 @@ static void execute_instances_tasks(const Span<const bke::GeometryComponent *> s
   VArray<blender::float4x4>::ForSpan(src_base_transforms);
   Array<int> offsets_data(src_components.size() + 1);
   for (const int component_index : src_components.index_range()) {
-    const auto &src_component = static_cast<const bke::InstancesComponent &>(*src_components[component_index]);
+    const auto &src_component = static_cast<const bke::InstancesComponent &>(
+        *src_components[component_index]);
     offsets_data[component_index] = src_component.get()->instances_num();
   }
   const OffsetIndices offsets = offset_indices::accumulate_counts_to_offsets(offsets_data);
@@ -936,7 +941,8 @@ static void execute_instances_tasks(const Span<const bke::GeometryComponent *> s
   MutableSpan<int> all_handles = dst_instances->reference_handles();
 
   for (const int component_index : src_components.index_range()) {
-    const auto &src_component = static_cast<const bke::InstancesComponent &>(*src_components[component_index]);
+    const auto &src_component = static_cast<const bke::InstancesComponent &>(
+        *src_components[component_index]);
     const bke::Instances &src_instances = *src_component.get();
     const blender::float4x4 src_base_transform = src_base_transforms[component_index];
     const Array<const void *> attribute_fallback_array = attribute_fallback[component_index].array;
@@ -953,7 +959,8 @@ static void execute_instances_tasks(const Span<const bke::GeometryComponent *> s
 
       const CPPType *cpp_type = bke::custom_data_type_to_cpp_type(type);
       BLI_assert(cpp_type != nullptr);
-      bke::GSpanAttributeWriter write_attribute = dst_instances->attributes_for_write().lookup_for_write_span(id);
+      bke::GSpanAttributeWriter write_attribute =
+          dst_instances->attributes_for_write().lookup_for_write_span(id);
       GMutableSpan dst_span = write_attribute.span;
       if (!write_attribute) {  // do not override existing attributes
         continue;
@@ -976,7 +983,6 @@ static void execute_instances_tasks(const Span<const bke::GeometryComponent *> s
     for (blender::float4x4 &transfrom : all_transforms.slice(dst_range)) {
       transfrom *= src_base_transform;
     }
-    
   }
   result.replace_instances(dst_instances.release());
   auto &dst_component = result.get_component_for_write<bke::InstancesComponent>();
@@ -1826,7 +1832,8 @@ bke::GeometrySet realize_instances(bke::GeometrySet geometry_set,
   AllMeshesInfo all_meshes_info = preprocess_meshes(geometry_set, options);
   AllCurvesInfo all_curves_info = preprocess_curves(geometry_set, options);
   bool tmp = true;
-  OrderedAttributes all_instance_attributes = gather_generic_instance_attributes_to_propagate(geometry_set, options, tmp);
+  OrderedAttributes all_instance_attributes = gather_generic_instance_attributes_to_propagate(
+      geometry_set, options, tmp);
 
   Vector<std::unique_ptr<GArray<>>> temporary_arrays;
   const bool create_id_attribute = all_pointclouds_info.create_id_attribute ||

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

@@ -25,11 +25,7 @@ static void node_declare(NodeDeclarationBuilder &b)
       .default_value(true)
       .supports_field()
       .description(("Determine wether to realize nested instances completly"));
-  b.add_input<decl::Int>("Depth")
+  b.add_input<decl::Int>("Depth").default_value(99).min(0).supports_field().description(
-      .default_value(99)
-      .min(0)
-      .supports_field()
-      .description(
       ("Number of levels of nested instances to realize for each top-level instance"));
   b.add_output<decl::Geometry>("Geometry").propagate_all();
 }
@@ -60,8 +56,10 @@ static void node_geo_exec(GeoNodeExecParams params)
   const bke::InstancesFieldContext field_context{instances};
   fn::FieldEvaluator evaluator{field_context, instances.instances_num()};
 
-  Field<int> depth_field_overrided(FieldOperation::Create(depth_override, {depth_field, realize_all_filed}));
+  Field<int> depth_field_overrided(
-  Field<bool> selection_field_overrided(FieldOperation::Create(selction_override, {depth_field_overrided, selection_field}));
+      FieldOperation::Create(depth_override, {depth_field, realize_all_filed}));
+  Field<bool> selection_field_overrided(
+      FieldOperation::Create(selction_override, {depth_field_overrided, selection_field}));
 
   evaluator.add(depth_field_overrided);
   evaluator.set_selection(selection_field_overrided);