Revert "BLI: Refactor vector types & functions to use templates"

Reverted because the commit removes a lot of commits.

This reverts commit a2c1c368af48644fa8995ecbe7138cc0d7900c30.

3 files changed, 10 insertions, 4 deletions

diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_column.cc b/source/blender/editors/space_spreadsheet/spreadsheet_column.cc
index ede8756a9da..ee623083db7 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_column.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_column.cc
@@ -19,8 +19,9 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_color.hh"
+#include "BLI_float2.hh"
+#include "BLI_float3.hh"
 #include "BLI_hash.hh"
-#include "BLI_math_vec_types.hh"
 #include "BLI_string.h"
 #include "BLI_string_ref.hh"
 
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc b/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc
index f4b5ff819ed..7cc2d8d0b48 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc
@@ -17,7 +17,8 @@
 #include <iomanip>
 #include <sstream>
 
-#include "BLI_math_vec_types.hh"
+#include "BLI_float2.hh"
+#include "BLI_float3.hh"
 
 #include "BKE_geometry_set.hh"
 
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc
index 556c0b0d5ca..36c7f1057df 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc
@@ -123,7 +123,9 @@ static void apply_row_filter(const SpreadsheetRowFilter &row_filter,
         const float threshold_sq = row_filter.threshold;
         apply_filter_operation(
             column_data.typed<float2>(),
-            [&](const float2 cell) { return math::distance_squared(cell, value) > threshold_sq; },
+            [&](const float2 cell) {
+              return float2::distance_squared(cell, value) > threshold_sq;
+            },
             prev_mask,
             new_indices);
         break;
@@ -153,7 +155,9 @@ static void apply_row_filter(const SpreadsheetRowFilter &row_filter,
         const float threshold_sq = row_filter.threshold;
         apply_filter_operation(
             column_data.typed<float3>(),
-            [&](const float3 cell) { return math::distance_squared(cell, value) > threshold_sq; },
+            [&](const float3 cell) {
+              return float3::distance_squared(cell, value) > threshold_sq;
+            },
             prev_mask,
             new_indices);
         break;