1 files changed, 19 insertions, 27 deletions
diff --git a/source/blender/nodes/geometry/nodes/node_geo_dual_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_dual_mesh.cc
index 84e63845b84..9b1c13bf563 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_dual_mesh.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_dual_mesh.cc
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include "BLI_array_utils.hh"
 #include "BLI_task.hh"
 
 #include "DNA_mesh_types.h"
@@ -105,18 +106,6 @@ static void copy_data_based_on_pairs(Span<T> data,
   }
 }
 
-/* Copy using the map. */
-template<typename T>
-static void copy_data_based_on_new_to_old_map(Span<T> data,
-                                              MutableSpan<T> r_data,
-                                              const Span<int> new_to_old_map)
-{
-  for (const int i : r_data.index_range()) {
-    const int old_i = new_to_old_map[i];
-    r_data[i] = data[old_i];
-  }
-}
-
 /**
  * Transfers the attributes from the original mesh to the new mesh using the following logic:
  * - If the attribute was on the face domain it is now on the point domain, and this is true
@@ -168,7 +157,6 @@ static void transfer_attributes(
         src_attribute.varray.type());
     GSpanAttributeWriter dst_attribute = dst_attributes.lookup_or_add_for_write_only_span(
         attribute_id, out_domain, data_type);
-
     if (!dst_attribute) {
       continue;
     }
@@ -177,20 +165,24 @@ static void transfer_attributes(
       using T = decltype(dummy);
       VArraySpan<T> span{src_attribute.varray.typed<T>()};
       MutableSpan<T> dst_span = dst_attribute.span.typed<T>();
-      if (src_attribute.domain == ATTR_DOMAIN_FACE) {
-        dst_span.take_front(span.size()).copy_from(span);
-        if (keep_boundaries) {
-          copy_data_based_on_pairs(span, dst_span, boundary_vertex_to_relevant_face_map);
-        }
-      }
-      else if (src_attribute.domain == ATTR_DOMAIN_POINT) {
-        copy_data_based_on_vertex_types(span, dst_span, vertex_types, keep_boundaries);
-      }
-      else if (src_attribute.domain == ATTR_DOMAIN_EDGE) {
-        copy_data_based_on_new_to_old_map(span, dst_span, new_to_old_edges_map);
-      }
-      else {
-        copy_data_based_on_new_to_old_map(span, dst_span, new_to_old_face_corners_map);
+      switch (src_attribute.domain) {
+        case ATTR_DOMAIN_POINT:
+          copy_data_based_on_vertex_types(span, dst_span, vertex_types, keep_boundaries);
+          break;
+        case ATTR_DOMAIN_EDGE:
+          array_utils::gather(span, new_to_old_edges_map, dst_span);
+          break;
+        case ATTR_DOMAIN_FACE:
+          dst_span.take_front(span.size()).copy_from(span);
+          if (keep_boundaries) {
+            copy_data_based_on_pairs(span, dst_span, boundary_vertex_to_relevant_face_map);
+          }
+          break;
+        case ATTR_DOMAIN_CORNER:
+          array_utils::gather(span, new_to_old_face_corners_map, dst_span);
+          break;
+        default:
+          BLI_assert_unreachable();
       }
     });
     dst_attribute.finish();