1 files changed, 10 insertions, 9 deletions

diff --git a/source/blender/nodes/geometry/nodes/node_geo_translate_instances.cc b/source/blender/nodes/geometry/nodes/node_geo_translate_instances.cc
index 3e9fe99adb0..23052abddc4 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_translate_instances.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_translate_instances.cc
@@ -2,6 +2,8 @@
 
 #include "BLI_task.hh"
 
+#include "BKE_instances.hh"
+
 #include "node_geometry_util.hh"
 
 namespace blender::nodes::node_geo_translate_instances_cc {
@@ -15,10 +17,10 @@ static void node_declare(NodeDeclarationBuilder &b)
   b.add_output<decl::Geometry>(N_("Instances"));
 }
 
-static void translate_instances(GeoNodeExecParams &params, InstancesComponent &instances_component)
+static void translate_instances(GeoNodeExecParams &params, bke::Instances &instances)
 {
-  const bke::InstancesFieldContext context{instances_component};
-  fn::FieldEvaluator evaluator{context, instances_component.instances_num()};
+  const bke::InstancesFieldContext context{instances};
+  fn::FieldEvaluator evaluator{context, instances.instances_num()};
   evaluator.set_selection(params.extract_input<Field<bool>>("Selection"));
   evaluator.add(params.extract_input<Field<float3>>("Translation"));
   evaluator.add(params.extract_input<Field<bool>>("Local Space"));
@@ -28,16 +30,16 @@ static void translate_instances(GeoNodeExecParams &params, InstancesComponent &i
   const VArray<float3> translations = evaluator.get_evaluated<float3>(0);
   const VArray<bool> local_spaces = evaluator.get_evaluated<bool>(1);
 
-  MutableSpan<float4x4> instance_transforms = instances_component.instance_transforms();
+  MutableSpan<float4x4> transforms = instances.transforms();
 
   threading::parallel_for(selection.index_range(), 1024, [&](IndexRange range) {
     for (const int i_selection : range) {
       const int i = selection[i_selection];
       if (local_spaces[i]) {
-        instance_transforms[i] *= float4x4::from_location(translations[i]);
+        transforms[i] *= float4x4::from_location(translations[i]);
       }
       else {
-        add_v3_v3(instance_transforms[i].values[3], translations[i]);
+        add_v3_v3(transforms[i].values[3], translations[i]);
       }
     }
   });
@@ -46,9 +48,8 @@ static void translate_instances(GeoNodeExecParams &params, InstancesComponent &i
 static void node_geo_exec(GeoNodeExecParams params)
 {
   GeometrySet geometry_set = params.extract_input<GeometrySet>("Instances");
-  if (geometry_set.has_instances()) {
-    InstancesComponent &instances = geometry_set.get_component_for_write<InstancesComponent>();
-    translate_instances(params, instances);
+  if (bke::Instances *instances = geometry_set.get_instances_for_write()) {
+    translate_instances(params, *instances);
   }
   params.set_output("Instances", std::move(geometry_set));
 }