1 files changed, 6 insertions, 5 deletions

diff --git a/source/blender/nodes/geometry/nodes/node_geo_set_position.cc b/source/blender/nodes/geometry/nodes/node_geo_set_position.cc
index 880252de4fa..e243fe3614c 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_set_position.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_set_position.cc
@@ -8,6 +8,7 @@
 #include "DNA_meshdata_types.h"
 
 #include "BKE_curves.hh"
+#include "BKE_mesh.h"
 
 #include "node_geometry_util.hh"
 
@@ -17,7 +18,7 @@ static void node_declare(NodeDeclarationBuilder &b)
 {
   b.add_input<decl::Geometry>(N_("Geometry"));
   b.add_input<decl::Bool>(N_("Selection")).default_value(true).hide_value().supports_field();
-  b.add_input<decl::Vector>(N_("Position")).implicit_field();
+  b.add_input<decl::Vector>(N_("Position")).implicit_field(implicit_field_inputs::position);
   b.add_input<decl::Vector>(N_("Offset")).supports_field().subtype(PROP_TRANSLATION);
   b.add_output<decl::Geometry>(N_("Geometry"));
 }
@@ -35,14 +36,14 @@ static void set_computed_position_and_offset(GeometryComponent &component,
   switch (component.type()) {
     case GEO_COMPONENT_TYPE_MESH: {
       Mesh *mesh = static_cast<MeshComponent &>(component).get_for_write();
-      MutableSpan<MVert> mverts{mesh->mvert, mesh->totvert};
+      MutableSpan<MVert> verts = mesh->verts_for_write();
       if (in_positions.is_same(positions.varray)) {
         devirtualize_varray(in_offsets, [&](const auto in_offsets) {
           threading::parallel_for(
               selection.index_range(), grain_size, [&](const IndexRange range) {
                 for (const int i : selection.slice(range)) {
                   const float3 offset = in_offsets[i];
-                  add_v3_v3(mverts[i].co, offset);
+                  add_v3_v3(verts[i].co, offset);
                 }
               });
         });
@@ -54,7 +55,7 @@ static void set_computed_position_and_offset(GeometryComponent &component,
                   selection.index_range(), grain_size, [&](const IndexRange range) {
                     for (const int i : selection.slice(range)) {
                       const float3 new_position = in_positions[i] + in_offsets[i];
-                      copy_v3_v3(mverts[i].co, new_position);
+                      copy_v3_v3(verts[i].co, new_position);
                     }
                   });
             });
@@ -136,7 +137,7 @@ static void set_position_in_component(GeometryComponent &component,
 {
   eAttrDomain domain = component.type() == GEO_COMPONENT_TYPE_INSTANCES ? ATTR_DOMAIN_INSTANCE :
                                                                           ATTR_DOMAIN_POINT;
-  GeometryComponentFieldContext field_context{component, domain};
+  bke::GeometryFieldContext field_context{component, domain};
   const int domain_size = component.attribute_domain_size(domain);
   if (domain_size == 0) {
     return;