One or the other?

Marlin/ubl.h

@@ -326,8 +326,11 @@
         return i < GRID_MAX_POINTS_Y ? pgm_read_float(&_mesh_index_to_ypos[i]) : MESH_MIN_Y + i * (MESH_Y_DIST);
       }
 
+      #if UBL_SEGMENTED
         static bool prepare_segmented_line_to(const float (&rtarget)[XYZE], const float &feedrate);
-      static void line_to_destination_cartesian(const float &fr, uint8_t e);
+      #else
+        static void line_to_destination_cartesian(const float &fr, const uint8_t e);
+      #endif
 
       #define _CMPZ(a,b) (z_values[a][b] == z_values[a][b+1])
       #define CMPZ(a) (_CMPZ(a, 0) && _CMPZ(a, 1))

Marlin/ubl_motion.cpp

@@ -36,7 +36,9 @@
     extern void set_current_from_destination();
   #endif
 
-  void unified_bed_leveling::line_to_destination_cartesian(const float &feed_rate, uint8_t extruder) {
+  #if !UBL_SEGMENTED
+
+    void unified_bed_leveling::line_to_destination_cartesian(const float &feed_rate, const uint8_t extruder) {
       /**
        * Much of the nozzle movement will be within the same cell. So we will do as little computation
        * as possible to determine if this is the case. If this move is within the same cell, we will
@@ -402,15 +404,7 @@
       set_current_from_destination();
     }
 
-  #if UBL_SEGMENTED
-
-    // macro to inline copy exactly 4 floats, don't rely on sizeof operator
-    #define COPY_XYZE( target, source ) { \
-                target[X_AXIS] = source[X_AXIS]; \
-                target[Y_AXIS] = source[Y_AXIS]; \
-                target[Z_AXIS] = source[Z_AXIS]; \
-                target[E_AXIS] = source[E_AXIS]; \
-            }
+  #else // UBL_SEGMENTED
 
     #if IS_SCARA // scale the feed rate from mm/s to degrees/s
       static float scara_feed_factor, scara_oldA, scara_oldB;