1 files changed, 14 insertions, 11 deletions

diff --git a/source/blender/nodes/geometry/nodes/node_geo_set_material_index.cc b/source/blender/nodes/geometry/nodes/node_geo_set_material_index.cc
index 58613dae832..f6dded56315 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_set_material_index.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_set_material_index.cc
@@ -14,22 +14,23 @@ static void node_declare(NodeDeclarationBuilder &b)
 
 static void set_material_index_in_component(GeometryComponent &component,
                                             const Field<bool> &selection_field,
-                                            const Field<int> &index_field)
+                                            const Field<int> &index_field,
+                                            const eAttrDomain domain)
 {
-  GeometryComponentFieldContext field_context{component, ATTR_DOMAIN_FACE};
-  const int domain_num = component.attribute_domain_num(ATTR_DOMAIN_FACE);
-  if (domain_num == 0) {
+  const int domain_size = component.attribute_domain_size(domain);
+  if (domain_size == 0) {
     return;
   }
+  MutableAttributeAccessor attributes = *component.attributes_for_write();
+  bke::GeometryFieldContext field_context{component, domain};
 
-  OutputAttribute_Typed<int> indices = component.attribute_try_get_for_output_only<int>(
-      "material_index", ATTR_DOMAIN_FACE);
+  AttributeWriter<int> indices = attributes.lookup_or_add_for_write<int>("material_index", domain);
 
-  fn::FieldEvaluator evaluator{field_context, domain_num};
+  fn::FieldEvaluator evaluator{field_context, domain_size};
   evaluator.set_selection(selection_field);
-  evaluator.add_with_destination(index_field, indices.varray());
+  evaluator.add_with_destination(index_field, indices.varray);
   evaluator.evaluate();
-  indices.save();
+  indices.finish();
 }
 
 static void node_geo_exec(GeoNodeExecParams params)
@@ -40,8 +41,10 @@ static void node_geo_exec(GeoNodeExecParams params)
 
   geometry_set.modify_geometry_sets([&](GeometrySet &geometry_set) {
     if (geometry_set.has_mesh()) {
-      set_material_index_in_component(
-          geometry_set.get_component_for_write<MeshComponent>(), selection_field, index_field);
+      set_material_index_in_component(geometry_set.get_component_for_write<MeshComponent>(),
+                                      selection_field,
+                                      index_field,
+                                      ATTR_DOMAIN_FACE);
     }
   });
   params.set_output("Geometry", std::move(geometry_set));